busybox-w32/util-linux, branch 1_28_4

nsenter: fix parsing of -t, -S and -G options

2018-05-22T15:52:51+00:00

-t, -S and -G each take mandatory integer arguments. getopt32long()'s option string syntax for this type of argument is 'c:+', however nsenter's opt_str uses 'c+', which specifies two options 'c' and '+' which do not take arguments. This means that giving a target PID causes nsenter to exit and print the usage string: # nsenter -t1 sh nsenter: unrecognized option: 1 BusyBox v1.27.2 (2017-12-12 10:41:50 GMT) multi-call binary. ... The long form options are also broken: # nsenter --setuid=1000 --setgid=1000 sh BusyBox v1.29.0.git (2018-05-04 13:56:49 UTC) multi-call binary. ... `nsenter --target= sh` parses correctly and appears to work, but is ignored and set to 0. This doesn't raise an error unless one of the namespace arguments is also given: # ./busybox_unstripped nsenter --target=42 sh # exit # ./busybox_unstripped nsenter -n --target=42 sh BusyBox v1.29.0.git (2018-05-04 13:56:49 UTC) multi-call binary. ... This has caused problems in a couple of places: https://github.com/linuxkit/linuxkit/issues/567 https://github.com/gliderlabs/docker-alpine/issues/359 https://github.com/kontena/pharos-cluster/pull/81 Signed-off-by: Euan Harris Signed-off-by: Denys Vlasenko

nsenter: Rename --network option to --net

2018-05-22T15:52:51+00:00

In nsenter from util-linux, the long version of the -n option is --net=. BusyBox's version expects --network=, 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 Signed-off-by: Denys Vlasenko

umount: ignore -c

2018-02-14T16:38:29+00:00

"-c, --no-canonicalize: Do not canonicalize paths." As busybox doesn't canonicalize paths in the first place it is safe to ignore this option. See https://github.com/systemd/systemd/issues/7786 Signed-off-by: Shawn Landden Signed-off-by: Denys Vlasenko

unshare: -r should map root to user, not the other way around

2017-11-09T15:06:33+00:00

Signed-off-by: Denys Vlasenko

unshare: -r implies -U, not -u

2017-11-09T14:59:22+00:00

Signed-off-by: Denys Vlasenko

Fix build failures if MAXHOSTNAMELEN or MAXPATHLEN is not defined

2017-10-31T14:59:19+00:00

Signed-off-by: Denys Vlasenko

blkdiscard: Only build on Linux

2017-10-30T13:55:01+00:00

Signed-off-by: James Clarke Signed-off-by: Denys Vlasenko

whitespace and comment format fixes, no code changes

2017-10-05T13:33:28+00:00

Signed-off-by: Denys Vlasenko

whitespace and comment format fixes, no code changes

2017-10-05T12:40:24+00:00

Signed-off-by: Denys Vlasenko

regularize format of source file headers, no code changes

2017-09-18T14:28:43+00:00

Signed-off-by: Denys Vlasenko