]> git.ipfire.org Git - thirdparty/coreutils.git/commitdiff
tests: parameterize the "root" username
authorPádraig Brady <P@draigBrady.com>
Sun, 22 Sep 2013 02:59:58 +0000 (03:59 +0100)
committerPádraig Brady <P@draigBrady.com>
Sun, 22 Sep 2013 02:59:58 +0000 (03:59 +0100)
* 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

index 8eb658d94b6157e89d12f8e3a9af200dab415073..cb4dc233b0969f4793086a6fa5c45e9e1f66e6d8 100755 (executable)
@@ -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=$(