public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fix some references to dhclient.

Browse Source 
svn path=/nixos/trunk/; revision=33359
This commit is contained in:
Eelco Dolstra 2012-03-22 13:02:42 +00:00
parent 4ae7819c39
commit b46e911012
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/virtualisation/xen-dom0.nix
View File

@ -155,10 +155,10 @@ in
postStop = "${xen}/etc/init.d/xendomains stop"; postStop = "${xen}/etc/init.d/xendomains stop";
}; };
# To prevent a race between dhclient and xend's bridge setup # To prevent a race between dhcpcd and xend's bridge setup script
# script (which renames eth* to peth* and recreates eth* as a # (which renames eth* to peth* and recreates eth* as a virtual
# virtual device), start dhclient after xend. # device), start dhcpcd after xend.
jobs.dhclient.startOn = mkOverride 50 "started xend"; jobs.dhcpcd.startOn = mkOverride 50 "started xend";
environment.etc = environment.etc =
[ { source = xendConfig; [ { source = xendConfig;

2
tests/installer.nix
View File

@ -114,7 +114,7 @@ let
$machine->waitForJob("tty1"); $machine->waitForJob("tty1");
$machine->waitForJob("rogue"); $machine->waitForJob("rogue");
$machine->waitForJob("nixos-manual"); $machine->waitForJob("nixos-manual");
$machine->waitForJob("dhclient"); $machine->waitForJob("dhcpcd");
${optionalString testChannel '' ${optionalString testChannel ''
# Allow the machine to talk to the fake nixos.org. # Allow the machine to talk to the fake nixos.org.