#include <termios.h>
#include <sys/signalfd.h>
#include <grp.h>
+#include <linux/fs.h>
#include "log.h"
#include "util.h"
static char *arg_directory = NULL;
static char *arg_user = NULL;
-static bool arg_no_net = false;
+static bool arg_private_network = false;
static int help(void) {
" -h --help Show this help\n"
" -D --directory=NAME Root directory for the container\n"
" -u --user=USER Run the command under specified user or uid\n"
- " --no-net Disable network in container\n",
+ " --private-network Disable network in container\n",
program_invocation_short_name);
return 0;
static int parse_argv(int argc, char *argv[]) {
enum {
- ARG_NO_NET = 0x100
+ ARG_PRIVATE_NETWORK = 0x100
};
static const struct option options[] = {
- { "help", no_argument, NULL, 'h' },
- { "directory", required_argument, NULL, 'D' },
- { "user", required_argument, NULL, 'u' },
- { "no-net", no_argument, NULL, ARG_NO_NET },
- { NULL, 0, NULL, 0 }
+ { "help", no_argument, NULL, 'h' },
+ { "directory", required_argument, NULL, 'D' },
+ { "user", required_argument, NULL, 'u' },
+ { "private-network", no_argument, NULL, ARG_PRIVATE_NETWORK },
+ { NULL, 0, NULL, 0 }
};
int c;
break;
- case ARG_NO_NET:
- arg_no_net = true;
+ case ARG_PRIVATE_NETWORK:
+ arg_private_network = true;
break;
case '?':
break;
}
- if ((t = path_is_mount_point(where)) < 0) {
+ if ((t = path_is_mount_point(where, false)) < 0) {
log_error("Failed to detect whether %s is a mount point: %s", where, strerror(-t));
free(where);
sigset_add_many(&mask, SIGCHLD, SIGWINCH, SIGTERM, SIGINT, -1);
assert_se(sigprocmask(SIG_BLOCK, &mask, NULL) == 0);
- if ((pid = syscall(__NR_clone, SIGCHLD|CLONE_NEWIPC|CLONE_NEWNS|CLONE_NEWPID|CLONE_NEWUTS|(arg_no_net ? CLONE_NEWNET : 0), NULL)) < 0) {
+ if ((pid = syscall(__NR_clone, SIGCHLD|CLONE_NEWIPC|CLONE_NEWNS|CLONE_NEWPID|CLONE_NEWUTS|(arg_private_network ? CLONE_NEWNET : 0), NULL)) < 0) {
log_error("clone() failed: %m");
goto finish;
}