Fix Minijail usage message.
Some options were missing from the command line. Alphabetize options
except for cases where two non-contiguous options are closely
related.
Bug: None
Change-Id: I0d79be4cee0b4e89b5088e054c396998ef2570a9
diff --git a/minijail0.c b/minijail0.c
index e21d056..69e6cbd 100644
--- a/minijail0.c
+++ b/minijail0.c
@@ -110,11 +110,12 @@
{
size_t i;
- printf("Usage: %s [-GhiIlnprstUv]\n"
- " [-b <src>,<dest>[,<writeable>]] [-f <file>]"
- " [-c <caps>] [-C <dir>] [-g <group>] [-u <user>]\n"
- " [-S <file>] [-k <src>,<dest>,<type>[,<flags>][,<data>]] [-T <type>]\n"
+ printf("Usage: %s [-GhHiIKlLnNprstUv]\n"
+ " [-a <table>]\n"
+ " [-b <src>,<dest>[,<writeable>]] [-k <src>,<dest>,<type>[,<flags>][,<data>]]\n"
+ " [-c <caps>] [-C <dir>] [-P <dir>] [-e[file]] [-f <file>] [-g <group>]\n"
" [-m[<uid> <loweruid> <count>]*] [-M[<gid> <lowergid> <count>]*]\n"
+ " [-S <file>] [-T <type>] [-u <user>] [-V <file>]\n"
" <program> [args...]\n"
" -a <table>: Use alternate syscall table <table>.\n"
" -b: Bind <src> to <dest> in chroot.\n"
@@ -125,10 +126,12 @@
" -c <caps>: Restrict caps to <caps>.\n"
" -C <dir>: chroot(2) to <dir>.\n"
" Not compatible with -P.\n"
+ " -P <dir>: pivot_root(2) to <dir> (implies -v).\n"
+ " Not compatible with -C.\n"
" -e[file]: Enter new network namespace, or existing one if |file| is provided.\n"
" -f <file>: Write the pid of the jailed process to <file>.\n"
- " -G: Inherit supplementary groups from uid.\n"
" -g <group>: Change gid to <group>.\n"
+ " -G: Inherit supplementary groups from uid.\n"
" -h: Help (this message).\n"
" -H: Seccomp filter help message.\n"
" -i: Exit immediately after fork (do not act as init).\n"
@@ -143,17 +146,15 @@
printf("%s ", log_syscalls[i]);
printf("\n"
- " -m: Set the uid mapping of a user namespace (implies -pU).\n"
+ " -m: Set the uid map of a user namespace (implies -pU).\n"
" Same arguments as newuidmap(1), multiple mappings should be separated by ',' (comma).\n"
" Not compatible with -b without the 'writable' option.\n"
- " -M: Set the gid mapping of a user namespace (implies -pU).\n"
+ " -M: Set the gid map of a user namespace (implies -pU).\n"
" Same arguments as newgidmap(1), multiple mappings should be separated by ',' (comma).\n"
" Not compatible with -b without the 'writable' option.\n"
" -n: Set no_new_privs.\n"
" -N: Enter a new cgroup namespace.\n"
" -p: Enter new pid namespace (implies -vr).\n"
- " -P <dir>: pivot_root(2) to <dir> (implies -v).\n"
- " Not compatible with -C.\n"
" -r: Remount /proc read-only (implies -v).\n"
" -s: Use seccomp.\n"
" -S <file>: Set seccomp filter using <file>.\n"