diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-16 12:16:34 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-16 12:16:34 +0200 |
| commit | 756ca94e0c37ed30609243e682b535a2bc040bf1 (patch) | |
| tree | e1cc2bed3d726409e2833b197d477a6d71083ce6 /nixos | |
| parent | aeb3169b714fbf777a3c9057ed4556e46f714fd1 (diff) | |
| download | nixlib-756ca94e0c37ed30609243e682b535a2bc040bf1.tar nixlib-756ca94e0c37ed30609243e682b535a2bc040bf1.tar.gz nixlib-756ca94e0c37ed30609243e682b535a2bc040bf1.tar.bz2 nixlib-756ca94e0c37ed30609243e682b535a2bc040bf1.tar.lz nixlib-756ca94e0c37ed30609243e682b535a2bc040bf1.tar.xz nixlib-756ca94e0c37ed30609243e682b535a2bc040bf1.tar.zst nixlib-756ca94e0c37ed30609243e682b535a2bc040bf1.zip | |
Really fix the EFI installer test
http://hydra.nixos.org/build/6497361
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/tests/efi-installer.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/nixos/tests/efi-installer.nix b/nixos/tests/efi-installer.nix index e16c402e7f71..8a05dbf2a610 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", |