fix: make testsuite pass on OpenSuse and Arch

This removes some hard assumptions about the file system layout.

It also hardens the tests with network interface renaming rules and
guards.

Author: haraldh

test/TEST-01-BASIC/test-init.sh

@@ -3,7 +3,7 @@
 
 . /lib/dracut-lib.sh
 
-export PATH=/sbin:/bin:/usr/sbin:/usr/bin
+export PATH=/usr/sbin:/usr/bin:/sbin:/bin
 command -v plymouth > /dev/null 2>&1 && plymouth --quit
 exec > /dev/console 2>&1
 

test/TEST-01-BASIC/test.sh

@@ -37,9 +37,6 @@ test_setup() {
             cd "$initdir" || exit
             mkdir -p -- dev sys proc etc var/run tmp
             mkdir -p root usr/bin usr/lib usr/lib64 usr/sbin
-            for i in bin sbin lib lib64; do
-                ln -sfnr usr/$i $i
-            done
         )
         inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip \
             mount dmesg dhclient mkdir cp ping dhclient \

test/TEST-02-SYSTEMD/test-init.sh

@@ -3,7 +3,7 @@
 
 . /lib/dracut-lib.sh
 
-export PATH=/sbin:/bin:/usr/sbin:/usr/bin
+export PATH=/usr/sbin:/usr/bin:/sbin:/bin
 command -v plymouth > /dev/null 2>&1 && plymouth --quit
 exec > /dev/console 2>&1
 

test/TEST-02-SYSTEMD/test.sh

@@ -35,9 +35,6 @@ test_setup() {
             cd "$initdir" || exit
             mkdir -p -- dev sys proc etc var/run tmp
             mkdir -p root usr/bin usr/lib usr/lib64 usr/sbin
-            for i in bin sbin lib lib64; do
-                ln -sfnr usr/$i $i
-            done
             mkdir -p -- var/lib/nfs/rpc_pipefs
         )
         inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip \

test/TEST-03-USR-MOUNT/test-init.sh

@@ -3,7 +3,7 @@
 
 . /lib/dracut-lib.sh
 
-export PATH=/sbin:/bin:/usr/sbin:/usr/bin
+export PATH=/usr/sbin:/usr/bin:/sbin:/bin
 command -v plymouth > /dev/null 2>&1 && plymouth --quit
 exec > /dev/console 2>&1
 

test/TEST-03-USR-MOUNT/test.sh

@@ -57,9 +57,6 @@ test_setup() {
             cd "$initdir" || exit
             mkdir -p -- dev sys proc etc var/run tmp
             mkdir -p root usr/bin usr/lib usr/lib64 usr/sbin
-            for i in bin sbin lib lib64; do
-                ln -sfnr usr/$i $i
-            done
         )
         inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip \
             mount dmesg dhclient mkdir cp ping dhclient \

test/TEST-04-FULL-SYSTEMD/test-init.sh

@@ -3,7 +3,7 @@
 
 . /lib/dracut-lib.sh
 
-export PATH=/sbin:/bin:/usr/sbin:/usr/bin
+export PATH=/usr/sbin:/usr/bin:/sbin:/bin
 command -v plymouth > /dev/null 2>&1 && plymouth --quit
 exec > /dev/console 2>&1
 

test/TEST-04-FULL-SYSTEMD/test.sh

@@ -90,11 +90,7 @@ test_setup() {
             return 1
         fi
         inst /sbin/init
-        inst /lib/systemd/system/systemd-remount-fs.service
-        inst /lib/systemd/systemd-remount-fs
-        inst /lib/systemd/system/systemd-journal-flush.service
-        inst /lib/systemd/system/slices.target
-        inst_multiple -o /lib/systemd/system/dracut*
+        inst_multiple -o {,/usr}/lib/systemd/system/"dracut*"
 
         inst_simple "${basedir}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh"
         inst_binary "${basedir}/dracut-util" "/usr/bin/dracut-util"
@@ -112,7 +108,7 @@ test_setup() {
             /etc/shadow \
             /etc/group \
             /etc/shells \
-            /etc/nsswitch.conf \
+            {,/usr}/etc/nsswitch.conf \
             /etc/pam.conf \
             /etc/securetty \
             /etc/os-release \
@@ -200,7 +196,7 @@ EOF
         ln -fs /proc/self/mounts "$initdir"/etc/mtab
 
         # install any Execs from the service files
-        grep -Eho '^Exec[^ ]*=[^ ]+' "$initdir"/lib/systemd/system/*.service \
+        grep -Eho '^Exec[^ ]*=[^ ]+' "$initdir"{,/usr}/lib/systemd/system/*.service \
             | while read -r i || [ -n "$i" ]; do
                 i=${i##Exec*=}
                 i=${i##-}

test/TEST-10-RAID/test-init.sh

@@ -3,7 +3,7 @@
 
 . /lib/dracut-lib.sh
 
-export PATH=/sbin:/bin:/usr/sbin:/usr/bin
+export PATH=/usr/sbin:/usr/bin:/sbin:/bin
 command -v plymouth > /dev/null 2>&1 && plymouth --quit
 exec > /dev/console 2>&1
 

test/TEST-10-RAID/test.sh

@@ -37,9 +37,6 @@ test_setup() {
             cd "$initdir" || exit
             mkdir -p -- dev sys proc etc var/run tmp
             mkdir -p root usr/bin usr/lib usr/lib64 usr/sbin
-            for i in bin sbin lib lib64; do
-                ln -sfnr usr/$i $i
-            done
         )
         inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip \
             mount dmesg dhclient mkdir cp ping dhclient dd sync