aboutgitcodebugslistschat
diff options
context:
space:
mode:
authorDavid Gibson <david@gibson.dropbear.id.au>2022-08-26 14:58:35 +1000
committerStefano Brivio <sbrivio@redhat.com>2022-08-30 19:43:31 +0200
commit8de488892f3909fbce00643b5f2d494bb2304adf (patch)
treeeba3ac4063131604c908933f3107d60e3e3f1593
parentff1ac78a5e3f5045e8663640f2487a3caee91bc5 (diff)
downloadpasst-8de488892f3909fbce00643b5f2d494bb2304adf.tar
passt-8de488892f3909fbce00643b5f2d494bb2304adf.tar.gz
passt-8de488892f3909fbce00643b5f2d494bb2304adf.tar.bz2
passt-8de488892f3909fbce00643b5f2d494bb2304adf.tar.lz
passt-8de488892f3909fbce00643b5f2d494bb2304adf.tar.xz
passt-8de488892f3909fbce00643b5f2d494bb2304adf.tar.zst
passt-8de488892f3909fbce00643b5f2d494bb2304adf.zip
Remove --nsrun-dir option
pasta can identify a netns as a "name", which is to say a path relative to (usually) /run/netns, which is the place that ip(8) creates persistent network namespaces. Alternatively a full path to a netns can be given. The --nsrun-dir option allows the user to change the standard path where netns names are resolved. However, there's no real point to this, if the user wants to override the location of the netns, they can just as easily use the full path to specify the netns. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
-rw-r--r--conf.c24
-rw-r--r--passt.16
2 files changed, 4 insertions, 26 deletions
diff --git a/conf.c b/conf.c
index 7c4930a..10d4ae8 100644
--- a/conf.c
+++ b/conf.c
@@ -510,14 +510,13 @@ static int conf_ns_check(void *arg)
/**
* conf_ns_opt() - Open network, user namespaces descriptors from configuration
* @c: Execution context
- * @nsdir: --nsrun-dir argument, can be an empty string
* @conf_userns: --userns argument, can be an empty string
* @optarg: PID, path or name of namespace
*
* Return: 0 on success, negative error code otherwise
*/
static int conf_ns_opt(struct ctx *c,
- char *nsdir, const char *conf_userns, const char *optarg)
+ const char *conf_userns, const char *optarg)
{
int ufd = -1, nfd = -1, try, ret, netns_only_reset = c->netns_only;
char userns[PATH_MAX] = { 0 }, netns[PATH_MAX];
@@ -557,7 +556,7 @@ static int conf_ns_opt(struct ctx *c,
continue;
} else if (try == 2) {
ret = snprintf(netns, PATH_MAX, "%s/%s",
- *nsdir ? nsdir : NETNS_RUN_DIR, optarg);
+ NETNS_RUN_DIR, optarg);
if (ret <= 0 || ret > (int)sizeof(netns))
continue;
}
@@ -859,8 +858,6 @@ pasta_opts:
info( " --userns NSPATH Target user namespace to join");
info( " --netns-only Don't join existing user namespace");
info( " implied if PATH or NAME are given without --userns");
- info( " --nsrun-dir Directory for nsfs mountpoints");
- info( " default: " NETNS_RUN_DIR);
info( " --config-net Configure tap interface in namespace");
info( " --ns-mac-addr ADDR Set MAC address on tap interface");
@@ -1040,7 +1037,6 @@ void conf(struct ctx *c, int argc, char **argv)
{"udp-ns", required_argument, NULL, 'U' },
{"userns", required_argument, NULL, 2 },
{"netns-only", no_argument, &c->netns_only, 1 },
- {"nsrun-dir", required_argument, NULL, 3 },
{"config-net", no_argument, &c->pasta_conf_ns, 1 },
{"ns-mac-addr", required_argument, NULL, 4 },
{"dhcp-dns", no_argument, NULL, 5 },
@@ -1054,7 +1050,7 @@ void conf(struct ctx *c, int argc, char **argv)
{ 0 },
};
struct get_bound_ports_ns_arg ns_ports_arg = { .c = c };
- char nsdir[PATH_MAX] = { 0 }, userns[PATH_MAX] = { 0 };
+ char userns[PATH_MAX] = { 0 };
enum conf_port_type tcp_tap = 0, tcp_init = 0;
enum conf_port_type udp_tap = 0, udp_init = 0;
bool v4_only = false, v6_only = false;
@@ -1093,18 +1089,6 @@ void conf(struct ctx *c, int argc, char **argv)
usage(argv[0]);
}
break;
- case 3:
- if (c->mode != MODE_PASTA) {
- err("--nsrun-dir is for pasta mode only");
- usage(argv[0]);
- }
-
- ret = snprintf(nsdir, sizeof(nsdir), "%s", optarg);
- if (ret <= 0 || ret >= (int)sizeof(nsdir)) {
- err("Invalid nsrun-dir: %s", optarg);
- usage(argv[0]);
- }
- break;
case 4:
if (c->mode != MODE_PASTA) {
err("--ns-mac-addr is for pasta mode only");
@@ -1479,7 +1463,7 @@ void conf(struct ctx *c, int argc, char **argv)
check_root(c);
if (c->mode == MODE_PASTA && optind + 1 == argc) {
- ret = conf_ns_opt(c, nsdir, userns, argv[optind]);
+ ret = conf_ns_opt(c, userns, argv[optind]);
if (ret == -ENOENT)
err("Namespace %s not found", argv[optind]);
if (ret < 0)
diff --git a/passt.1 b/passt.1
index 78b10b8..bbdadc1 100644
--- a/passt.1
+++ b/passt.1
@@ -459,12 +459,6 @@ If the target network namespace is bound to the filesystem (that is, if PATH or
NAME are given as target), do not exit once the network namespace is deleted.
.TP
-.BR \-\-nsrun-dir " " \fIpath
-Directory for nsfs mountpoints, used as path prefix for names of namespaces.
-
-The default path is shown with --help.
-
-.TP
.BR \-\-config-net
Configure networking in the namespace: set up addresses and routes as configured
or sourced from the host, and bring up the tap interface.