@@ -294,7 +294,7 @@ let
294294 # the same during and after installation.
295295 virtualisation.emptyDiskImages = [ 512 ];
296296 virtualisation.bootDevice =
297− if grubVersion == 1 then "/dev/sdb" else "/dev/vdb";
297+ if grubVersion == 1 then "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive2" else "/dev/vdb";
298298 virtualisation.qemu.diskInterface =
299299 if grubVersion == 1 then "scsi" else "virtio";
300300
@@ -695,22 +695,23 @@ in {
695695 };
696696
697697 # Test a basic install using GRUB 1.
698− grub1 = makeInstallerTest "grub1" {
698+ grub1 = makeInstallerTest "grub1" rec {
699699 createPartitions = ''
700700 machine.succeed(
701− "flock /dev/sda parted --script /dev/sda -- mklabel msdos"
701+ "flock ${grubDevice} parted --script ${grubDevice} -- mklabel msdos"
702702 + " mkpart primary linux-swap 1M 1024M"
703703 + " mkpart primary ext2 1024M -1s",
704704 "udevadm settle",
705− "mkswap /dev/sda1 -L swap",
705+ "mkswap ${grubDevice}-part1 -L swap",
706706 "swapon -L swap",
707− "mkfs.ext3 -L nixos /dev/sda2",
707+ "mkfs.ext3 -L nixos ${grubDevice}-part2",
708708 "mount LABEL=nixos /mnt",
709709 "mkdir -p /mnt/tmp",
710710 )
711711 '';
712712 grubVersion = 1;
713− grubDevice = "/dev/sda";
713+ # /dev/sda is not stable, even when the SCSI disk number is.
714+ grubDevice = "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive1";
714715 };
715716
716717 # Test using labels to identify volumes in grub