From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Mon, 13 Sep 2021 16:14:05 +0000 (+0200)
Subject: test: specify the rootfs by label
X-Git-Tag: v250-rc1~662^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bac05644a7b5530dc7a9242458fed486cafef099;p=thirdparty%2Fsystemd.git

test: specify the rootfs by label

otherwise the boot might fail when attaching multiple SATA devices to
the VM.
---

diff --git a/test/test-functions b/test/test-functions
index c07073bf9da..6c9847a914a 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -410,7 +410,7 @@ run_qemu() {
     fi
 
     kernel_params+=(
-        "root=/dev/sda1"
+        "root=LABEL=systemd_boot"
         "rw"
         "raid=noautodetect"
         "rd.luks=0"
@@ -1120,9 +1120,9 @@ EOF
 
     udevadm settle
 
-    local label=(-L systemd)
+    local label=(-L systemd_boot)
     # mkfs.reiserfs doesn't know -L. so, use --label instead
-    [[ "$FSTYPE" == "reiserfs" ]] && label=(--label systemd)
+    [[ "$FSTYPE" == "reiserfs" ]] && label=(--label systemd_boot)
     if ! mkfs -t "${FSTYPE}" "${label[@]}" "${LOOPDEV}p1" -q; then
         dfatal "Failed to mkfs -t ${FSTYPE}"
         exit 1