diff --git a/tests/installer.nix b/tests/installer.nix index a0c3102c042..2a6bca34e7d 100644 --- a/tests/installer.nix +++ b/tests/installer.nix @@ -282,9 +282,8 @@ in { "ls -l /dev/vda* >&2", "cat /proc/partitions >&2", "mdadm --create --force /dev/md0 --metadata 1.2 --level=raid1 --raid-devices=2 /dev/vda5 /dev/vda6", - "mdadm -W /dev/md0", # wait for sync to finish; booting off an unsynced device tends to fail "mdadm --create --force /dev/md1 --metadata 1.2 --level=raid1 --raid-devices=2 /dev/vda7 /dev/vda8", - "mdadm -W /dev/md1", + "udevadm settle", "mkswap -f /dev/md1 -L swap", "swapon -L swap", "mkfs.ext3 -L nixos /dev/md0", @@ -292,6 +291,9 @@ in { "mkfs.ext3 -L boot /dev/vda1", "mkdir /mnt/boot", "mount LABEL=boot /mnt/boot", + "udevadm settle", + "mdadm -W /dev/md0", # wait for sync to finish; booting off an unsynced device tends to fail + "mdadm -W /dev/md1", ); ''; fileSystems = rootFS + bootFS;