diff options
Diffstat (limited to 'tests/misc')
| -rwxr-xr-x | tests/misc/chroot-fail.sh | 23 | ||||
| -rwxr-xr-x | tests/misc/truncate-owned-by-other.sh | 2 |
2 files changed, 20 insertions, 5 deletions
diff --git a/tests/misc/chroot-fail.sh b/tests/misc/chroot-fail.sh index a84826fd7..82ae23cdb 100755 --- a/tests/misc/chroot-fail.sh +++ b/tests/misc/chroot-fail.sh @@ -30,7 +30,7 @@ chroot --- / true # unknown option test $? = 125 || fail=1 # Note chroot("/") succeeds for non-root users on some systems, but not all, -# however we avoid the chroot() with "/" to have common behvavior. +# however we avoid the chroot() with "/" to have common behavior. chroot / sh -c 'exit 2' # exit status propagation test $? = 2 || fail=1 chroot / . # invalid command @@ -38,10 +38,25 @@ test $? = 126 || fail=1 chroot / no_such # no such command test $? = 127 || fail=1 -# Ensure we don't chdir("/") when not changing root -# to allow only changing user ids for a command. -for dir in '/' '/.' '/../'; do +# Ensure that --skip-chdir fails with a non-"/" argument. +cat <<\EOF > exp || framework_failure_ +chroot: option --skip-chdir only permitted if NEWROOT is old '/' +Try 'chroot --help' for more information. +EOF +chroot --skip-chdir . env pwd >out 2>err && fail=1 +compare /dev/null out || fail=1 +compare exp err || fail=1 + +# Ensure we don't chroot("/") when NEWROOT is old "/". +ln -s / isroot || framework_failure_ +for dir in '/' '/.' '/../' isroot; do + # Verify that chroot(1) succeeds and performs chdir("/") + # (chroot(1) of coreutils-8.23 failed to run the latter). curdir=$(chroot "$dir" env pwd) || fail=1 + test "$curdir" = '/' || fail=1 + + # Test the "--skip-chdir" option. + curdir=$(chroot --skip-chdir "$dir" env pwd) || fail=1 test "$curdir" = '/' && fail=1 done diff --git a/tests/misc/truncate-owned-by-other.sh b/tests/misc/truncate-owned-by-other.sh index e70badb6b..f65439ea1 100755 --- a/tests/misc/truncate-owned-by-other.sh +++ b/tests/misc/truncate-owned-by-other.sh @@ -29,7 +29,7 @@ chmod g+w root-owned # Ensure that the current directory is searchable by $NON_ROOT_USERNAME. chmod g+x . -chroot --user=$NON_ROOT_USERNAME / env PATH="$PATH" \ +chroot --skip-chdir --user=$NON_ROOT_USERNAME / env PATH="$PATH" \ truncate -s0 root-owned || fail=1 Exit $fail |