minijail: allow -i and -p to be used together
There's no reason to make these mutually exclusive since you can
daemonize in both cases fine (the minijail_run_pid_pipes launch
logic takes care of spawning an init inside the pid ns).
BUG=None
TEST=ran a process with -pi and saw it daemonize in its own pid ns
Change-Id: I72c67cc9049d4b44779b85b43339c120bb7399a4
Reviewed-on: https://chromium-review.googlesource.com/239861
Reviewed-by: Jorge Lucangeli Obes <jorgelo@chromium.org>
Trybot-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
diff --git a/minijail0.c b/minijail0.c
index 3a60740..e9887b7 100644
--- a/minijail0.c
+++ b/minijail0.c
@@ -126,7 +126,6 @@
int opt;
int chroot = 0;
int mount_tmp = 0;
- int use_pid_ns = 0;
int use_seccomp_filter = 0;
const size_t path_max = 4096;
const char *filter_path;
@@ -194,25 +193,12 @@
minijail_inherit_usergroups(j);
break;
case 'p':
- if (*exit_immediately) {
- fprintf(stderr,
- "Could not enter pid namespace because "
- "'-i' was specified.\n");
- exit(1);
- }
- use_pid_ns = 1;
minijail_namespace_pids(j);
break;
case 'e':
minijail_namespace_net(j);
break;
case 'i':
- if (use_pid_ns) {
- fprintf(stderr,
- "Could not disable init loop because "
- "'-p' was specified.\n");
- exit(1);
- }
*exit_immediately = 1;
break;
case 'H':
