about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-05-21 15:42:02 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-05-21 15:55:50 +0200
commitf23231f198f3122ab52982bcd4fbf0e225b24664 (patch)
treeeeb9cc88a20265ce37314020ff3243fd3fdc8ab6 /nixos
parent784503864bb1961f523f24fa6d6d745de6b01b0e (diff)
downloadnixlib-f23231f198f3122ab52982bcd4fbf0e225b24664.tar
nixlib-f23231f198f3122ab52982bcd4fbf0e225b24664.tar.gz
nixlib-f23231f198f3122ab52982bcd4fbf0e225b24664.tar.bz2
nixlib-f23231f198f3122ab52982bcd4fbf0e225b24664.tar.lz
nixlib-f23231f198f3122ab52982bcd4fbf0e225b24664.tar.xz
nixlib-f23231f198f3122ab52982bcd4fbf0e225b24664.tar.zst
nixlib-f23231f198f3122ab52982bcd4fbf0e225b24664.zip
Installer test: Don't wait for dhcpcd if we don't have a network
Diffstat (limited to 'nixos')
-rw-r--r--nixos/tests/installer.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 60d5166821fc..1c3fb148410c 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -129,9 +129,10 @@ let
       #$machine->waitForUnit('getty@tty2');
       $machine->waitForUnit("rogue");
       $machine->waitForUnit("nixos-manual");
-      $machine->waitForUnit("dhcpcd");
 
       ${optionalString testChannel ''
+        $machine->waitForUnit("dhcpcd");
+
         # Allow the machine to talk to the fake nixos.org.
         $machine->succeed(
             "rm /etc/hosts",