Author: eelco
Date: Thu Mar 22 13:02:42 2012
New Revision: 33359
URL: https://nixos.org/websvn/nix/?rev=33359&sc=1
Log:
* Fix some references to dhclient.
Modified:
nixos/trunk/modules/virtualisation/xen-dom0.nix
nixos/trunk/tests/installer.nix
Modified: nixos/trunk/modules/virtualisation/xen-dom0.nix
==============================================================================
--- nixos/trunk/modules/virtualisation/xen-dom0.nix Thu Mar 22 13:01:06
2012 (r33358)
+++ nixos/trunk/modules/virtualisation/xen-dom0.nix Thu Mar 22 13:02:42
2012 (r33359)
@@ -155,10 +155,10 @@
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;
Modified: nixos/trunk/tests/installer.nix
==============================================================================
--- nixos/trunk/tests/installer.nix Thu Mar 22 13:01:06 2012 (r33358)
+++ nixos/trunk/tests/installer.nix Thu Mar 22 13:02:42 2012 (r33359)
@@ -114,7 +114,7 @@
$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.
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
