test(UEFI): make test determinsitic

identify the boot drive by id

diff --git a/test/TEST-18-UEFI/test-init.sh b/test/TEST-18-UEFI/test-init.sh
index 03966d2fcb57453d3deeea0d121001a0467eaaa6..b80e3918c0c8f16c2a64cc0c6bce5ad3d657f287 100755 (executable)
--- a/test/TEST-18-UEFI/test-init.sh
+++ b/test/TEST-18-UEFI/test-init.sh
@@ -19,5 +19,5 @@ grep -q '^tmpfs /run tmpfs' /proc/self/mounts \
 exec > /dev/console 2>&1
 
 echo "made it to the rootfs! Powering down."
-echo "dracut-root-block-success" | dd oflag=direct,dsync of=/dev/sdb
+echo "dracut-root-block-success" | dd oflag=direct,dsync of=/dev/disk/by-id/ata-disk_marker
 poweroff -f

diff --git a/test/TEST-18-UEFI/test.sh b/test/TEST-18-UEFI/test.sh
index 4191fed5dc74f46d0612017fa4f9a4563aba2271..948782343b50342f6c102a3fb0ae06f73dfa479d 100755 (executable)
--- a/test/TEST-18-UEFI/test.sh
+++ b/test/TEST-18-UEFI/test.sh
@@ -78,7 +78,7 @@ test_setup() {
     mkdir -p "$TESTDIR"/ESP/EFI/BOOT
     test_dracut \
         --modules 'rootfs-block test' \
-        --kernel-cmdline 'root=/dev/sdc ro rd.skipfsck rootfstype=squashfs' \
+        --kernel-cmdline 'root=/dev/disk/by-id/ata-disk_root ro rd.skipfsck rootfstype=squashfs' \
         --drivers 'ahci sd_mod squashfs' \
         --uefi \
         "$TESTDIR"/ESP/EFI/BOOT/BOOTX64.efi