From e6f2eaf47a177a8eca054d1d70a1b6287e8c3521 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 3 Jun 2024 16:01:35 +0200 Subject: Adding upstream version 102. Signed-off-by: Daniel Baumann --- test/TEST-12-RAID-DEG/create-root.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'test/TEST-12-RAID-DEG/create-root.sh') diff --git a/test/TEST-12-RAID-DEG/create-root.sh b/test/TEST-12-RAID-DEG/create-root.sh index 05dec0f..865bfae 100755 --- a/test/TEST-12-RAID-DEG/create-root.sh +++ b/test/TEST-12-RAID-DEG/create-root.sh @@ -10,7 +10,7 @@ rm -f -- /etc/lvm/lvm.conf udevadm control --reload udevadm settle set -ex -mdadm --create /dev/md0 --run --auto=yes --level=5 --raid-devices=3 /dev/disk/by-id/ata-disk_raid[123] +mdadm --create /dev/md0 --run --auto=yes --level=5 --raid-devices=3 /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_raid[123] # wait for the array to finish initializing, otherwise this sometimes fails # randomly. mdadm -W /dev/md0 || : @@ -22,7 +22,7 @@ lvm pvcreate -ff -y /dev/mapper/dracut_crypt_test lvm vgcreate dracut /dev/mapper/dracut_crypt_test lvm lvcreate -l 100%FREE -n root dracut lvm vgchange -ay -mkfs.ext4 -L root /dev/dracut/root +mkfs.ext4 -q -L root /dev/dracut/root mkdir -p /sysroot mount -t ext4 /dev/dracut/root /sysroot cp -a -t /sysroot /source/* @@ -42,6 +42,6 @@ eval "$(udevadm info --query=property --name=/dev/md0 | while read -r line || [ echo "dracut-root-block-created" echo MD_UUID="$MD_UUID" echo "ID_FS_UUID=$ID_FS_UUID" -} | dd oflag=direct,dsync of=/dev/disk/by-id/ata-disk_marker +} | dd oflag=direct,dsync of=/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_marker status=none sync poweroff -f -- cgit v1.2.3