diff options
| author | Karel Zak | 2018-09-11 12:43:03 +0200 |
|---|---|---|
| committer | Karel Zak | 2018-09-11 12:47:39 +0200 |
| commit | da6392177d8dc23653d02df801ab67b46ebd9f9a (patch) | |
| tree | 32a956a68a6120710b29c43301f4c0c834a2e9a6 /sys-utils/unshare.c | |
| parent | lsblk: don't ask udev when --sysroot specified (diff) | |
| download | kernel-qcow2-util-linux-da6392177d8dc23653d02df801ab67b46ebd9f9a.tar.gz kernel-qcow2-util-linux-da6392177d8dc23653d02df801ab67b46ebd9f9a.tar.xz kernel-qcow2-util-linux-da6392177d8dc23653d02df801ab67b46ebd9f9a.zip | |
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 <kzak@redhat.com>
Diffstat (limited to 'sys-utils/unshare.c')
| -rw-r--r-- | sys-utils/unshare.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sys-utils/unshare.c b/sys-utils/unshare.c index 161cd27b9..661665aeb 100644 --- a/sys-utils/unshare.c +++ b/sys-utils/unshare.c @@ -259,13 +259,16 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" -p, --pid[=<file>] unshare pid namespace\n"), out); fputs(_(" -U, --user[=<file>] unshare user namespace\n"), out); fputs(_(" -C, --cgroup[=<file>] unshare cgroup namespace\n"), out); + fputs(USAGE_SEPARATOR, out); fputs(_(" -f, --fork fork before launching <program>\n"), out); - fputs(_(" --kill-child[=<signame>] when dying, kill the forked child (implies --fork); defaults to SIGKILL\n"), out); - fputs(_(" --mount-proc[=<dir>] 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[=<signame>] when dying, kill the forked child (implies --fork)\n" + " defaults to SIGKILL\n"), out); + fputs(_(" --mount-proc[=<dir>] 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)); |