emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unshare: fix help text; select LONG_OPTS instead depending on them

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-06-14 16:20:02 +02:00
parent 62d1e98fbd
commit 45100b8d07
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
util-linux/unshare.c
View File

@ -9,12 +9,13 @@
//config:config UNSHARE //config:config UNSHARE
//config: bool "unshare" //config: bool "unshare"
//config: default y //config: default y
//config: depends on LONG_OPTS && !NOMMU //config: depends on !NOMMU
//config: select PLATFORM_LINUX //config: select PLATFORM_LINUX
//config: select LONG_OPTS
//config: help //config: help
//config: Run program with some namespaces unshared from parent. //config: Run program with some namespaces unshared from parent.
// depends on LONG_OPTS: it is awkward to exclude code which handles --propagation // needs LONG_OPTS: it is awkward to exclude code which handles --propagation
// and --setgroups based on LONG_OPTS, so instead applet requires LONG_OPTS. // and --setgroups based on LONG_OPTS, so instead applet requires LONG_OPTS.
// depends on !NOMMU: we need fork() // depends on !NOMMU: we need fork()
@ -32,7 +33,7 @@
//usage: "\n -p,--pid[=FILE] Unshare PID namespace" //usage: "\n -p,--pid[=FILE] Unshare PID namespace"
//usage: "\n -U,--user[=FILE] Unshare user namespace" //usage: "\n -U,--user[=FILE] Unshare user namespace"
//usage: "\n -f,--fork Fork before execing PROG" //usage: "\n -f,--fork Fork before execing PROG"
//usage: "\n -r,--map-root-user Map current user to root (implies -u)" //usage: "\n -r,--map-root-user Map current user to root (implies -U)"
//usage: "\n --mount-proc[=DIR] Mount /proc filesystem first (implies -m)" //usage: "\n --mount-proc[=DIR] Mount /proc filesystem first (implies -m)"
//usage: "\n --propagation slave|shared|private|unchanged" //usage: "\n --propagation slave|shared|private|unchanged"
//usage: "\n Modify mount propagation in mount namespace" //usage: "\n Modify mount propagation in mount namespace"