Really fix the EFI installer test

http://hydra.nixos.org/build/6497361
This commit is contained in:
Eelco Dolstra 2013-10-16 12:16:34 +02:00
parent aeb3169b71
commit 756ca94e0c

View File

@ -68,14 +68,13 @@ in {
$machine->succeed("echo hello"); $machine->succeed("echo hello");
$machine->waitForUnit("rogue"); $machine->waitForUnit("rogue");
$machine->waitForUnit("nixos-manual"); $machine->waitForUnit("nixos-manual");
$machine->waitForUnit("dhcpcd");
# Partition the disk. # Partition the disk.
$machine->succeed( $machine->succeed(
"sgdisk -Z /dev/vda", "sgdisk -Z /dev/sda",
"sgdisk -n 1:0:+256M -N 2 -t 1:ef00 -t 2:8300 -c 1:boot -c 2:root /dev/vda", "sgdisk -n 1:0:+256M -N 2 -t 1:ef00 -t 2:8300 -c 1:boot -c 2:root /dev/sda",
"mkfs.vfat -n BOOT /dev/vda1", "mkfs.vfat -n BOOT /dev/sda1",
"mkfs.ext3 -L nixos /dev/vda2", "mkfs.ext3 -L nixos /dev/sda2",
"mount LABEL=nixos /mnt", "mount LABEL=nixos /mnt",
"mkdir /mnt/boot", "mkdir /mnt/boot",
"mount LABEL=BOOT /mnt/boot", "mount LABEL=BOOT /mnt/boot",