summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@lukeshu.com>2017-05-20 20:13:09 -0400
committerLuke Shumaker <lukeshu@parabola.nu>2018-08-16 21:55:17 -0400
commit247f2ab4724b275934c08ea94f03b65143a98939 (patch)
tree9106e82b1ccfc6ff3f858380d0e48bf34db85f3d
parent43368aa05f59ff87dcaad85c91915706a9b6376b (diff)
nspawn: Improve --help text
The `--help` text lies about what the `-U` flag does, and under-documents the `--private-users` values. . Fix that.
-rw-r--r--src/nspawn/nspawn.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index d4001e5070..f1afa3a9ca 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -230,9 +230,13 @@ static void help(void) {
" --uuid=UUID Set a specific machine UUID for the container\n"
" -S --slice=SLICE Place the container in the specified slice\n"
" --property=NAME=VALUE Set scope unit property\n"
- " -U --private-users=pick Run within user namespace, autoselect UID/GID range\n"
- " --private-users[=UIDBASE[:NUIDS]]\n"
+ " --private-users[=yes] Run within user namespace, detect UID/GID range\n"
+ " --private-users=UIDBASE[:NUIDS]\n"
" Similar, but with user configured UID/GID range\n"
+ " --private-users=pick Similar, but autoselect an unused UID/GID range,\n"
+ " implies --private-users-chown\n"
+ " -U Equivalent to --private-users=pick if the kernel\n"
+ " supports user namespaces; ignored otherwise\n"
" --private-users-chown Adjust OS tree ownership to private UID/GID range\n"
" --private-network Disable network in container\n"
" --network-interface=INTERFACE\n"