[git commit] unshare: fix help text; select LONG_OPTS instead depending on them

Denys Vlasenko vda.linux at googlemail.com
Wed Jun 14 14:20:02 UTC 2017

commit: https://git.busybox.net/busybox/commit/?id=45100b8d07aa69945194610a30cb427901128312
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
 util-linux/unshare.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/util-linux/unshare.c b/util-linux/unshare.c
index 52e8f14..875e3f8 100644
--- a/util-linux/unshare.c
+++ b/util-linux/unshare.c
@@ -9,12 +9,13 @@
 //config:config UNSHARE
 //config:	bool "unshare"
 //config:	default y
-//config:	depends on LONG_OPTS && !NOMMU
+//config:	depends on !NOMMU
 //config:	select PLATFORM_LINUX
+//config:	select LONG_OPTS
 //config:	help
 //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.
 // depends on !NOMMU: we need fork()
@@ -32,7 +33,7 @@
 //usage:     "\n	-p,--pid[=FILE]		Unshare PID namespace"
 //usage:     "\n	-U,--user[=FILE]	Unshare user namespace"
 //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	--propagation slave|shared|private|unchanged"
 //usage:     "\n				Modify mount propagation in mount namespace"

More information about the busybox-cvs mailing list