summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEuan Harris <euan.harris@docker.com>2018-05-03 12:34:46 (GMT)
committerDenys Vlasenko <vda.linux@googlemail.com>2018-05-13 16:58:23 (GMT)
commit40394cb1c963c35d2daa9570ba968afa981cf1fc (patch)
tree685dbd2124281c6060078f6238bcfd9dacaeafd8
parentd80eecb86812c1fbda652f9b995060c26ba0b155 (diff)
downloadbusybox-40394cb1c963c35d2daa9570ba968afa981cf1fc.tar.gz
busybox-40394cb1c963c35d2daa9570ba968afa981cf1fc.tar.bz2
nsenter: Rename --network option to --net
In nsenter from util-linux, the long version of the -n option is --net=<path>. BusyBox's version expects --network=<path>, so scripts and examples written for util-linux's version cause BusyBox's version to exit with the usage message. Confusingly, until commit 036585a911a5f, the usage message erroneously claimed that the long option was indeed called --net; after that commit long options are not listed at all. Signed-off-by: Euan Harris <euan.harris@docker.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--util-linux/nsenter.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/util-linux/nsenter.c b/util-linux/nsenter.c
index c6933c8..35439a2 100644
--- a/util-linux/nsenter.c
+++ b/util-linux/nsenter.c
@@ -112,7 +112,7 @@ static const char nsenter_longopts[] ALIGN1 =
"user\0" Optional_argument "U"
"ipc\0" Optional_argument "i"
"uts\0" Optional_argument "u"
- "network\0" Optional_argument "n"
+ "net\0" Optional_argument "n"
"pid\0" Optional_argument "p"
"mount\0" Optional_argument "m"
"target\0" Required_argument "t"