From 756ca94e0c37ed30609243e682b535a2bc040bf1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 16 Oct 2013 12:16:34 +0200 Subject: [PATCH] Really fix the EFI installer test http://hydra.nixos.org/build/6497361 --- nixos/tests/efi-installer.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/nixos/tests/efi-installer.nix b/nixos/tests/efi-installer.nix index e16c402e7f7..8a05dbf2a61 100644 --- a/nixos/tests/efi-installer.nix +++ b/nixos/tests/efi-installer.nix @@ -68,14 +68,13 @@ in { $machine->succeed("echo hello"); $machine->waitForUnit("rogue"); $machine->waitForUnit("nixos-manual"); - $machine->waitForUnit("dhcpcd"); # Partition the disk. $machine->succeed( - "sgdisk -Z /dev/vda", - "sgdisk -n 1:0:+256M -N 2 -t 1:ef00 -t 2:8300 -c 1:boot -c 2:root /dev/vda", - "mkfs.vfat -n BOOT /dev/vda1", - "mkfs.ext3 -L nixos /dev/vda2", + "sgdisk -Z /dev/sda", + "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/sda1", + "mkfs.ext3 -L nixos /dev/sda2", "mount LABEL=nixos /mnt", "mkdir /mnt/boot", "mount LABEL=BOOT /mnt/boot",