ci: add root=LABEL=dracut to the common kernel cmdline for tests

Individual tests can (and do) overide the default root.

diff --git a/test/TEST-10-BASIC/test.sh b/test/TEST-10-BASIC/test.sh
index af77c89bc381f0b269df8014f8b6505035a79f50..c0802d59403047d9136858edec10eae8ff8954c8 100755 (executable)
--- a/test/TEST-10-BASIC/test.sh
+++ b/test/TEST-10-BASIC/test.sh
@@ -12,7 +12,7 @@ test_run() {
 
     "$testdir"/run-qemu -nic none \
         "${disk_args[@]}" \
-        -append "$TEST_KERNEL_CMDLINE root=LABEL=dracut" \
+        -append "$TEST_KERNEL_CMDLINE" \
         -initrd "$TESTDIR"/initramfs.testing || return 1
 
     test_marker_check || return 1

diff --git a/test/TEST-11-USR-MOUNT/test.sh b/test/TEST-11-USR-MOUNT/test.sh
index 8ab79802953ea3ecdd75cc79dc53eed171dec769..51462147ddffb9c1bcc1e410bb41f74d9255b4cf 100755 (executable)
--- a/test/TEST-11-USR-MOUNT/test.sh
+++ b/test/TEST-11-USR-MOUNT/test.sh
@@ -29,7 +29,7 @@ client_run() {
     test_marker_reset
     "$testdir"/run-qemu \
         "${disk_args[@]}" \
-        -append "$TEST_KERNEL_CMDLINE root=LABEL=dracut $client_opts" \
+        -append "$TEST_KERNEL_CMDLINE $client_opts" \
         -initrd "$TESTDIR"/initramfs.testing || return 1
 
     if ! test_marker_check; then

diff --git a/test/TEST-20-STORAGE/create-root.sh b/test/TEST-20-STORAGE/create-root.sh
index e262c1ff52c1b356f8efdab075b6f0971e610b53..21c2366adf8e4f94568fc239b933e09e9a5df846 100755 (executable)
--- a/test/TEST-20-STORAGE/create-root.sh
+++ b/test/TEST-20-STORAGE/create-root.sh
@@ -10,7 +10,7 @@ if [ "$TEST_FSTYPE" = "zfs" ]; then
     zpool create dracut mirror /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_disk[12]
     zfs create dracut/root
 elif [ "$TEST_FSTYPE" = "btrfs" ]; then
-    mkfs.btrfs -q -draid1 -mraid1 -L root /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_disk[12]
+    mkfs.btrfs -q -draid1 -mraid1 -L dracut /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_disk[12]
     udevadm settle
     btrfs device scan
 else
@@ -51,7 +51,7 @@ else
 
     lvm vgchange --ignoremonitoring -ay
 
-    eval "mkfs.${TEST_FSTYPE} -q -L root /dev/dracut/root"
+    eval "mkfs.${TEST_FSTYPE} -q -L dracut /dev/dracut/root"
 fi
 
 udevadm settle

diff --git a/test/TEST-20-STORAGE/test.sh b/test/TEST-20-STORAGE/test.sh
index 3b54b0e2464c37634638bc334d47f9d7e7710e2c..b8c31cc3863498713b7f186e264c45b39e48dd71 100755 (executable)
--- a/test/TEST-20-STORAGE/test.sh
+++ b/test/TEST-20-STORAGE/test.sh
@@ -9,15 +9,9 @@ test_check() {
     (command -v zfs || (command -v lvm && command -v "mkfs.$TEST_FSTYPE")) &> /dev/null
 }
 
-if [ "$TEST_FSTYPE" = "zfs" ]; then
-    TEST_KERNEL_CMDLINE+=" root=ZFS=dracut/root "
-elif [ "$TEST_FSTYPE" = "btrfs" ]; then
-    TEST_KERNEL_CMDLINE+=" root=LABEL=root "
-else
-    TEST_KERNEL_CMDLINE+=" root=LABEL=root "
-
+if [ "$TEST_FSTYPE" != "zfs" ] && [ "$TEST_FSTYPE" != "btrfs" ]; then
     # test fips mode
-    [ -f /usr/share/crypto-policies/default-fips-config ] && TEST_KERNEL_CMDLINE+=" fips=1 rd.fips.skipkernel boot=LABEL=root "
+    [ -f /usr/share/crypto-policies/default-fips-config ] && TEST_KERNEL_CMDLINE+=" fips=1 rd.fips.skipkernel boot=LABEL=dracut "
 
     export USE_LVM=1
     command -v mdadm > /dev/null && export HAVE_RAID=1
@@ -46,6 +40,10 @@ client_run() {
         qemu_add_drive disk_index disk_args "$TESTDIR/${disk}-2.img" disk2
     fi
 
+    if [ "$TEST_FSTYPE" = "zfs" ]; then
+        TEST_KERNEL_CMDLINE+=" root=ZFS=dracut/root "
+    fi
+
     test_marker_reset
     "$testdir"/run-qemu \
         "${disk_args[@]}" \

diff --git a/test/TEST-41-FULL-SYSTEMD/test.sh b/test/TEST-41-FULL-SYSTEMD/test.sh
index 14e8e067ab45ae92da3029c45580b351f8193f9d..cec2df7fac1751e83333b3866c7430c46e907abf 100755 (executable)
--- a/test/TEST-41-FULL-SYSTEMD/test.sh
+++ b/test/TEST-41-FULL-SYSTEMD/test.sh
@@ -33,7 +33,7 @@ client_run() {
     "$testdir"/run-qemu \
         "${disk_args[@]}" \
         -smbios type=11,value=io.systemd.credential:key=test \
-        -append "$TEST_KERNEL_CMDLINE root=LABEL=dracut mount.usr=LABEL=dracutusr mount.usrflags=subvol=usr $client_opts $DEBUGOUT" \
+        -append "$TEST_KERNEL_CMDLINE mount.usr=LABEL=dracutusr mount.usrflags=subvol=usr $client_opts $DEBUGOUT" \
         -initrd "$TESTDIR"/initramfs.testing || return 1
 
     if ! test_marker_check; then

diff --git a/test/TEST-42-SYSTEMD-INITRD/test.sh b/test/TEST-42-SYSTEMD-INITRD/test.sh
index addb9c1dd327943a71fb9cdb8c9b60fba59e6575..6f077901795e841559bb91a562032c8e30381a1b 100755 (executable)
--- a/test/TEST-42-SYSTEMD-INITRD/test.sh
+++ b/test/TEST-42-SYSTEMD-INITRD/test.sh
@@ -23,7 +23,7 @@ client_run() {
     test_marker_reset
     "$testdir"/run-qemu \
         "${disk_args[@]}" \
-        -append "$TEST_KERNEL_CMDLINE root=LABEL=dracut $client_opts" \
+        -append "$TEST_KERNEL_CMDLINE $client_opts" \
         -initrd "$TESTDIR"/initramfs.testing || return 1
 
     if ! test_marker_check; then

diff --git a/test/TEST-43-KERNEL-INSTALL/test.sh b/test/TEST-43-KERNEL-INSTALL/test.sh
index 33ec3a55d0b14e29ba1ad9f8b0955b166935e244..a4eb03379665f39c269a46621c9bc96b2dad1fe0 100755 (executable)
--- a/test/TEST-43-KERNEL-INSTALL/test.sh
+++ b/test/TEST-43-KERNEL-INSTALL/test.sh
@@ -31,7 +31,7 @@ test_run() {
 
     "$testdir"/run-qemu \
         "${disk_args[@]}" \
-        -append "$TEST_KERNEL_CMDLINE root=LABEL=dracut" \
+        -append "$TEST_KERNEL_CMDLINE" \
         -initrd "$BOOT_ROOT/$TOKEN/$KVERSION"/initrd || return 1
 
     test_marker_check || return 1
@@ -41,7 +41,7 @@ test_run() {
     # rescue (non-hostonly) boot
     "$testdir"/run-qemu \
         "${disk_args[@]}" \
-        -append "$TEST_KERNEL_CMDLINE root=LABEL=dracut" \
+        -append "$TEST_KERNEL_CMDLINE" \
         -initrd "$BOOT_ROOT/$TOKEN"/0-rescue/initrd || return 1
 
     test_marker_check || return 1

diff --git a/test/test-functions b/test/test-functions
index bb0d53a2b5d1e6f9478c05db08fa580248a6cd4f..fe9eeaf63dd3e73ae102b056fb9a8fe7238207a4 100644 (file)
--- a/test/test-functions
+++ b/test/test-functions
@@ -22,7 +22,7 @@ PKGLIBDIR=${PKGLIBDIR-$basedir}
 [[ -f /etc/machine-id ]] && read -r TOKEN < /etc/machine-id
 [ -z "$TOKEN" ] && . /etc/os-release && TOKEN="$ID"
 
-TEST_KERNEL_CMDLINE+=" panic=1 oops=panic softlockup_panic=1 systemd.crash_reboot $DEBUGFAIL "
+TEST_KERNEL_CMDLINE+=" root=LABEL=dracut panic=1 oops=panic softlockup_panic=1 systemd.crash_reboot $DEBUGFAIL "
 
 if [[ $V != "1" && $V != "2" ]]; then
     TEST_KERNEL_CMDLINE+="quiet "