mirrors/passt
1
0
Fork 0
mirror of https://passt.top/passt synced 2025-06-20 13:55:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow pasta to take a command to execute

Browse source 
When not given an existing PID or network namspace to attach to, pasta
spawns a shell.  Most commands which can spawn a shell in an altered
environment can also run other commands in that same environment, which can
be useful in automation.

Allow pasta to do the same thing; it can be given an arbitrary command to
run in the network and user namespace which pasta creates.  If neither a
command nor an existing PID or netns to attach to is given, continue to
spawn a default shell, as before.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
David Gibson 2022-08-26 14:58:39 +10:00 • committed by Stefano Brivio
parent c188736cd8
commit 1392bc5ca0
4 changed files with 51 additions and 25 deletions

27
conf.c
View file

@ -550,7 +550,8 @@ static int conf_ns_pid(char *userns, char *netns, const char *arg)
return 0;
}
return -EINVAL;
/* Not a PID, later code will treat as a command */
return 0;
}
/**
@ -1498,14 +1499,18 @@ void conf(struct ctx *c, int argc, char **argv)
check_root(c);
if (c->mode == MODE_PASTA && optind + 1 == argc) {
ret = conf_ns_pid(userns, netns, argv[optind]);
if (ret < 0)
if (c->mode == MODE_PASTA) {
if (*netns && optind != argc) {
err("Both --netns and PID or command given");
usage(argv[0]);
} else if (c->mode == MODE_PASTA && *userns
&& !*netns && optind == argc) {
err("--userns requires --netns or PID");
usage(argv[0]);
} else if (optind + 1 == argc) {
ret = conf_ns_pid(userns, netns, argv[optind]);
if (ret < 0)
usage(argv[0]);
} else if (*userns && !*netns && optind == argc) {
err("--userns requires --netns or PID");
usage(argv[0]);
}
} else if (optind != argc) {
usage(argv[0]);
}
@ -1519,7 +1524,11 @@ void conf(struct ctx *c, int argc, char **argv)
if (ret < 0)
usage(argv[0]);
} else {
pasta_start_ns(c);
if (*userns) {
err("Both --userns and command given");
usage(argv[0]);
}
pasta_start_ns(c, argc - optind, argv + optind);
}
}