From 587cc684dc3f104bb9b6b05c7fc4873660909dac Mon Sep 17 00:00:00 2001 From: =?utf8?q?P=C3=A1draig=20Brady?=
Date: Sun, 22 Sep 2013 03:59:58 +0100 Subject: [PATCH] tests: parameterize the "root" username * tests/misc/chroot-credentials.sh: Don't assume uid 0 has the "root" name, nor any name for that matter. --- tests/misc/chroot-credentials.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/misc/chroot-credentials.sh b/tests/misc/chroot-credentials.sh index 8eb658d94b..cb4dc233b0 100755 --- a/tests/misc/chroot-credentials.sh +++ b/tests/misc/chroot-credentials.sh @@ -22,16 +22,17 @@ print_ver_ chroot require_root_ +root=$(id -nu 0) || skip_ "Couldn't lookup root username" # Verify that root credentials are kept. -test $(chroot / whoami) = root || fail=1 +test $(chroot / whoami) = "$root" || fail=1 test "$(groups)" = "$(chroot / groups)" || fail=1 # Verify that credentials are changed correctly. whoami_after_chroot=$( chroot --userspec=$NON_ROOT_USERNAME:$NON_ROOT_GROUP / whoami ) -test "$whoami_after_chroot" != root || fail=1 +test "$whoami_after_chroot" != "$root" || fail=1 # Verify that there are no additional groups. id_G_after_chroot=$( -- 2.47.2