summaryrefslogtreecommitdiffstats
path: root/sys-utils
diff options
context:
space:
mode:
authorKarel Zak2017-01-09 12:48:14 +0100
committerKarel Zak2017-01-09 12:50:47 +0100
commitb5672517fdf37df8f2e3fbf13065723d0486ca56 (patch)
treecf437f759eb35a03602abe490d284deab00fc517 /sys-utils
parentnsenter: fix usage() and improve man page (diff)
downloadkernel-qcow2-util-linux-b5672517fdf37df8f2e3fbf13065723d0486ca56.tar.gz
kernel-qcow2-util-linux-b5672517fdf37df8f2e3fbf13065723d0486ca56.tar.xz
kernel-qcow2-util-linux-b5672517fdf37df8f2e3fbf13065723d0486ca56.zip
unshare: fix SYNOPSIS and usage()
The "program" is optional and $SHELL is executed by default. Addresses: https://github.com/karelzak/util-linux/issues/389 Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'sys-utils')
-rw-r--r--sys-utils/unshare.17
-rw-r--r--sys-utils/unshare.c2
2 files changed, 5 insertions, 4 deletions
diff --git a/sys-utils/unshare.1 b/sys-utils/unshare.1
index ed3167815..7c7d144d1 100644
--- a/sys-utils/unshare.1
+++ b/sys-utils/unshare.1
@@ -4,11 +4,12 @@ unshare \- run program with some namespaces unshared from parent
.SH SYNOPSIS
.B unshare
[options]
-.I program
-.RI [ arguments ]
+.RI [ program
+.RI [ arguments ]]
.SH DESCRIPTION
Unshares the indicated namespaces from the parent process and then executes
-the specified \fIprogram\fR.
+the specified \fIprogram\fR. If \fIprogram\fR is not given, then ``${SHELL}'' is
+run (default: /bin/sh).
.PP
The namespaces can optionally be made persistent by bind mounting
/proc/\fIpid\fR/ns/\fItype\fR files to a filesystem path and entered with
diff --git a/sys-utils/unshare.c b/sys-utils/unshare.c
index edd9bbe69..0d02b70b3 100644
--- a/sys-utils/unshare.c
+++ b/sys-utils/unshare.c
@@ -243,7 +243,7 @@ static void usage(int status)
FILE *out = status == EXIT_SUCCESS ? stdout : stderr;
fputs(USAGE_HEADER, out);
- fprintf(out, _(" %s [options] <program> [<argument>...]\n"),
+ fprintf(out, _(" %s [options] [<program> [<argument>...]]\n"),
program_invocation_short_name);
fputs(USAGE_SEPARATOR, out);