From b46e9110120ba44642c5c06b7070a4aaa96a5205 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 22 Mar 2012 13:02:42 +0000
Subject: [PATCH] * Fix some references to dhclient.

svn path=/nixos/trunk/; revision=33359
---
 modules/virtualisation/xen-dom0.nix | 8 ++++----
 tests/installer.nix                 | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/virtualisation/xen-dom0.nix b/modules/virtualisation/xen-dom0.nix
index 77bf5ea8b7e0..8e2c066223eb 100644
--- a/modules/virtualisation/xen-dom0.nix
+++ b/modules/virtualisation/xen-dom0.nix
@@ -155,10 +155,10 @@ in
         postStop = "${xen}/etc/init.d/xendomains stop";
       };
 
-    # To prevent a race between dhclient and xend's bridge setup
-    # script (which renames eth* to peth* and recreates eth* as a
-    # virtual device), start dhclient after xend.
-    jobs.dhclient.startOn = mkOverride 50 "started xend";
+    # To prevent a race between dhcpcd and xend's bridge setup script
+    # (which renames eth* to peth* and recreates eth* as a virtual
+    # device), start dhcpcd after xend.
+    jobs.dhcpcd.startOn = mkOverride 50 "started xend";
 
     environment.etc =
       [ { source = xendConfig;
diff --git a/tests/installer.nix b/tests/installer.nix
index 2a6bca34e7dd..10930952a421 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -114,7 +114,7 @@ let
       $machine->waitForJob("tty1");
       $machine->waitForJob("rogue");
       $machine->waitForJob("nixos-manual");
-      $machine->waitForJob("dhclient");
+      $machine->waitForJob("dhcpcd");
 
       ${optionalString testChannel ''
         # Allow the machine to talk to the fake nixos.org.