[git commit branch/1_28_stable] nsenter: Rename --network option to --net
Denys Vlasenko
vda.linux at googlemail.com
Tue May 22 15:52:51 UTC 2018
commit: https://git.busybox.net/busybox/commit/?id=adb69765e52ad32608e3b56e0dd70a0510ab1b7c
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/1_28_stable
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 at docker.com>
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
util-linux/nsenter.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/util-linux/nsenter.c b/util-linux/nsenter.c
index c6933c8d5..35439a2ab 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"
More information about the busybox-cvs
mailing list