From: Karel Zak Date: Tue, 11 Sep 2018 10:43:03 +0000 (+0200) Subject: unshare: remove -s from --help output X-Git-Tag: v2.33-rc1~25 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=da6392177d8dc23653d02df801ab67b46ebd9f9a;p=thirdparty%2Futil-linux.git unshare: remove -s from --help output The code and man page do not assume -s to be short alias to --setgroups. This commit also a little bit change --help output formatting to make it more readable and structured. Addresses: https://github.com/karelzak/util-linux/pull/692 Signed-off-by: Karel Zak --- diff --git a/sys-utils/unshare.c b/sys-utils/unshare.c index 161cd27b96..661665aeba 100644 --- a/sys-utils/unshare.c +++ b/sys-utils/unshare.c @@ -259,13 +259,16 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -p, --pid[=] unshare pid namespace\n"), out); fputs(_(" -U, --user[=] unshare user namespace\n"), out); fputs(_(" -C, --cgroup[=] unshare cgroup namespace\n"), out); + fputs(USAGE_SEPARATOR, out); fputs(_(" -f, --fork fork before launching \n"), out); - fputs(_(" --kill-child[=] when dying, kill the forked child (implies --fork); defaults to SIGKILL\n"), out); - fputs(_(" --mount-proc[=] mount proc filesystem first (implies --mount)\n"), out); fputs(_(" -r, --map-root-user map current user to root (implies --user)\n"), out); - fputs(_(" --propagation slave|shared|private|unchanged\n" + fputs(USAGE_SEPARATOR, out); + fputs(_(" --kill-child[=] when dying, kill the forked child (implies --fork)\n" + " defaults to SIGKILL\n"), out); + fputs(_(" --mount-proc[=] mount proc filesystem first (implies --mount)\n"), out); + fputs(_(" --propagation slave|shared|private|unchanged\n" " modify mount propagation in mount namespace\n"), out); - fputs(_(" -s, --setgroups allow|deny control the setgroups syscall in user namespaces\n"), out); + fputs(_(" --setgroups allow|deny control the setgroups syscall in user namespaces\n"), out); fputs(USAGE_SEPARATOR, out); printf(USAGE_HELP_OPTIONS(27));