aboutsummaryrefslogtreecommitdiff
path: root/util-linux/unshare.c
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2017-06-14 16:20:02 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2017-06-14 16:20:02 +0200
commit45100b8d07aa69945194610a30cb427901128312 (patch)
tree01ca5f444e5dd32fbec6c90e9dfec819f345b469 /util-linux/unshare.c
parent62d1e98fbd0cc1b008237411d8b2ddc20d3e55a7 (diff)
downloadbusybox-w32-45100b8d07aa69945194610a30cb427901128312.tar.gz
busybox-w32-45100b8d07aa69945194610a30cb427901128312.tar.bz2
busybox-w32-45100b8d07aa69945194610a30cb427901128312.zip
unshare: fix help text; select LONG_OPTS instead depending on them
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'util-linux/unshare.c')
-rw-r--r--util-linux/unshare.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/util-linux/unshare.c b/util-linux/unshare.c
index 52e8f1421..875e3f86e 100644
--- a/util-linux/unshare.c
+++ b/util-linux/unshare.c
@@ -9,12 +9,13 @@
9//config:config UNSHARE 9//config:config UNSHARE
10//config: bool "unshare" 10//config: bool "unshare"
11//config: default y 11//config: default y
12//config: depends on LONG_OPTS && !NOMMU 12//config: depends on !NOMMU
13//config: select PLATFORM_LINUX 13//config: select PLATFORM_LINUX
14//config: select LONG_OPTS
14//config: help 15//config: help
15//config: Run program with some namespaces unshared from parent. 16//config: Run program with some namespaces unshared from parent.
16 17
17// depends on LONG_OPTS: it is awkward to exclude code which handles --propagation 18// needs LONG_OPTS: it is awkward to exclude code which handles --propagation
18// and --setgroups based on LONG_OPTS, so instead applet requires LONG_OPTS. 19// and --setgroups based on LONG_OPTS, so instead applet requires LONG_OPTS.
19// depends on !NOMMU: we need fork() 20// depends on !NOMMU: we need fork()
20 21
@@ -32,7 +33,7 @@
32//usage: "\n -p,--pid[=FILE] Unshare PID namespace" 33//usage: "\n -p,--pid[=FILE] Unshare PID namespace"
33//usage: "\n -U,--user[=FILE] Unshare user namespace" 34//usage: "\n -U,--user[=FILE] Unshare user namespace"
34//usage: "\n -f,--fork Fork before execing PROG" 35//usage: "\n -f,--fork Fork before execing PROG"
35//usage: "\n -r,--map-root-user Map current user to root (implies -u)" 36//usage: "\n -r,--map-root-user Map current user to root (implies -U)"
36//usage: "\n --mount-proc[=DIR] Mount /proc filesystem first (implies -m)" 37//usage: "\n --mount-proc[=DIR] Mount /proc filesystem first (implies -m)"
37//usage: "\n --propagation slave|shared|private|unchanged" 38//usage: "\n --propagation slave|shared|private|unchanged"
38//usage: "\n Modify mount propagation in mount namespace" 39//usage: "\n Modify mount propagation in mount namespace"