nsenter: Rename --network option to --net
authorEuan Harris <euan.harris@docker.com>
Thu, 3 May 2018 12:34:46 +0000 (13:34 +0100)
committerDenys Vlasenko <vda.linux@googlemail.com>
Tue, 22 May 2018 15:52:51 +0000 (17:52 +0200)
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>
util-linux/nsenter.c

index c6933c8d50d4c2332d6b980490aa82673bbd176e..35439a2ab339e52b5bf037cd5c289bdb32e9254e 100644 (file)
@@ -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"