Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support specified netns and userns file paths #86

Merged
merged 1 commit into from
Apr 25, 2019

Conversation

gabibeyer
Copy link
Contributor

Allow a network namespace path to be passed instead of a PID by
using the --use-netns-path argument, and passing a path as the
first argument. An optional --userns-path=PATH argument can be
passed that will be supersede the default user namespace path.

Fixes #84

Signed-off-by: Gabi Beyer Gabrielle.n.beyer@intel.com

@AkihiroSuda
Copy link
Member

thanks, could you also update man page? (edit slirp4netns.1.md and make generate-man)

@AkihiroSuda
Copy link
Member

cc @giuseppe

@gabibeyer
Copy link
Contributor Author

Thank you for the feedback, working on the changes! My C coding is a bit... rusty to say the least :p

@gabibeyer gabibeyer force-pushed the AddNSPath branch 3 times, most recently from 060264a to 97a7e2a Compare April 21, 2019 20:09
@@ -295,6 +309,9 @@ struct options {
char *cidr; // --cidr
bool enable_ipv6; // -6
char *api_socket; // -a
char *netns_type; // --netns-type
char *netns_path; // --netns-path
Copy link
Member

@AkihiroSuda AkihiroSuda Apr 22, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

// argv[1]

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah thank you

slirp4netns.1.md Outdated

```console
$ slirp4netns --userns-path=/path/to/userns ...
```
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this example doesn't seem needed

@AkihiroSuda
Copy link
Member

looks good but a couple of nits

Allow a network namespace path to be passed instead of a PID by
using the --use-netns-path argument, and passing a path as the
first argument. An optional --userns-path=PATH argument can be
passed that will be supersede the default user namespace path.

Fixes rootless-containers#84

Signed-off-by: Gabi Beyer <Gabrielle.n.beyer@intel.com>
@AkihiroSuda
Copy link
Member

@giuseppe ptal

@giuseppe
Copy link
Collaborator

LGTM

@giuseppe giuseppe merged commit 7556fbe into rootless-containers:master Apr 25, 2019
@AkihiroSuda
Copy link
Member

Shall we release 0.3.1? 0.4.0?

This was referenced Jul 23, 2019
This was referenced Aug 25, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support specifying netns (and userns?) file path as well as PID
4 participants