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

* Don't use the DHCP wrapper.

Browse Source 
svn path=/nixos/trunk/; revision=7921
This commit is contained in:
Eelco Dolstra 2007-02-20 14:20:33 +00:00
parent 17cc5ecc47
commit 619c3e0465
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
system/upstart.nix
View File

@ -93,8 +93,7 @@ import ../upstart-jobs/gather.nix {
# DHCP client. # DHCP client.
++ optional ["networking" "useDHCP"] ++ optional ["networking" "useDHCP"]
(import ../upstart-jobs/dhclient.nix { (import ../upstart-jobs/dhclient.nix {
inherit (pkgs) nettools; inherit (pkgs) nettools dhcp;
dhcp = pkgs.dhcpWrapper;
}) })
# SSH daemon. # SSH daemon.

2
upstart-jobs/dhclient.nix
View File

@ -9,6 +9,8 @@ description \"DHCP client\"
start on network-interfaces/started start on network-interfaces/started
stop on network-interfaces/stop stop on network-interfaces/stop
env PATH_DHCLIENT_SCRIPT=${dhcp}/sbin/dhclient-script
script script
# Determine the interface on which to start dhclient. # Determine the interface on which to start dhclient.
interfaces= interfaces=