]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test: specify the rootfs by label
authorFrantisek Sumsal <frantisek@sumsal.cz>
Mon, 13 Sep 2021 16:14:05 +0000 (18:14 +0200)
committerFrantisek Sumsal <frantisek@sumsal.cz>
Tue, 14 Sep 2021 17:15:13 +0000 (19:15 +0200)
otherwise the boot might fail when attaching multiple SATA devices to
the VM.

test/test-functions

index c07073bf9dafec19f24be465363ba5b54e748670..6c9847a914a78d33829800f000e1719661ac3be3 100644 (file)
@@ -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