diff options
author | Karel Zak | 2017-01-09 12:48:14 +0100 |
---|---|---|
committer | Karel Zak | 2017-01-09 12:50:09 +0100 |
commit | 0f0b5823a68c78e4ef62efd1f03cfcb6d549060d (patch) | |
tree | 97c58867236b8d98a4b266fcf89c7f2b2da88adb | |
parent | Merge branch 'betterMinixChecks' of https://github.com/n3world/util-linux (diff) | |
download | kernel-qcow2-util-linux-0f0b5823a68c78e4ef62efd1f03cfcb6d549060d.tar.gz kernel-qcow2-util-linux-0f0b5823a68c78e4ef62efd1f03cfcb6d549060d.tar.xz kernel-qcow2-util-linux-0f0b5823a68c78e4ef62efd1f03cfcb6d549060d.zip |
nsenter: fix usage() and improve man page
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>
-rw-r--r-- | sys-utils/nsenter.1 | 7 | ||||
-rw-r--r-- | sys-utils/nsenter.c | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sys-utils/nsenter.1 b/sys-utils/nsenter.1 index 66e3cecfe..95f28ae43 100644 --- a/sys-utils/nsenter.1 +++ b/sys-utils/nsenter.1 @@ -8,7 +8,9 @@ nsenter \- run program with namespaces of other processes .RI [ arguments ]] .SH DESCRIPTION Enters the namespaces of one or more other processes and then executes the specified -program. Enterable namespaces are: +\fIprogram\fP. If \fIprogram\fP is not given, then ``${SHELL}'' is run (default: /bin\:/sh). +.PP +Enterable namespaces are: .TP .B mount namespace Mounting and unmounting filesystems will not affect the rest of the system, @@ -91,9 +93,6 @@ flag in .BR clone (2). .TP See \fBclone\fP(2) for the exact semantics of the flags. -.TP -If \fIprogram\fP is not given, then ``${SHELL}'' is run (default: /bin\:/sh). - .SH OPTIONS Various of the options below that relate to namespaces take an optional .I file diff --git a/sys-utils/nsenter.c b/sys-utils/nsenter.c index 6dc7b225c..afa1b9c50 100644 --- a/sys-utils/nsenter.c +++ b/sys-utils/nsenter.c @@ -70,7 +70,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); |