* Undo unintended commit.

svn path=/nixos/trunk/; revision=32771
This commit is contained in:
Eelco Dolstra 2012-03-04 15:48:58 +00:00
parent 6c792b3d9e
commit 2ac5df3a93
2 changed files with 2 additions and 5 deletions

View File

@ -113,7 +113,7 @@
./services/networking/bitlbee.nix
./services/networking/cntlm.nix
./services/networking/ddclient.nix
./services/networking/dhcpcd.nix
./services/networking/dhclient.nix
./services/networking/dhcpd.nix
./services/networking/dnsmasq.nix
./services/networking/ejabberd.nix

View File

@ -33,9 +33,6 @@ let
# Ethernet cards used for bridging. Likewise for vif* and tap*
# (Xen) and virbr* and vnet* (libvirt).
denyinterfaces ${toString ignoredInterfaces} peth* vif* tap* tun* virbr* vnet* vboxnet*
# Disable listening for IPv6 Router Advertisements for now.
noipv6rs
'';
# Hook for emitting ip-up/ip-down events.
@ -75,7 +72,7 @@ in
path = [ dhcpcd pkgs.nettools pkgs.openresolv ];
exec = "dhcpcd --config ${dhcpcdConf} --nobackground";
exec = "dhcpcd --config ${dhcpcdConf} --nobackground --persistent";
};
environment.systemPackages = [ dhcpcd ];