Author: eelco
Date: Sun Mar 4 15:48:58 2012
New Revision: 32771
URL: https://nixos.org/websvn/nix/?rev=32771&sc=1
Log:
* Undo unintended commit.
Modified:
nixos/trunk/modules/module-list.nix
nixos/trunk/modules/services/networking/dhcpcd.nix
Modified: nixos/trunk/modules/module-list.nix
==============================================================================
--- nixos/trunk/modules/module-list.nix Sun Mar 4 15:47:44 2012 (r32770)
+++ nixos/trunk/modules/module-list.nix Sun Mar 4 15:48:58 2012 (r32771)
@@ -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
Modified: nixos/trunk/modules/services/networking/dhcpcd.nix
==============================================================================
--- nixos/trunk/modules/services/networking/dhcpcd.nix Sun Mar 4 15:47:44
2012 (r32770)
+++ nixos/trunk/modules/services/networking/dhcpcd.nix Sun Mar 4 15:48:58
2012 (r32771)
@@ -33,9 +33,6 @@
# 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 @@
path = [ dhcpcd pkgs.nettools pkgs.openresolv ];
- exec = "dhcpcd --config ${dhcpcdConf} --nobackground";
+ exec = "dhcpcd --config ${dhcpcdConf} --nobackground --persistent";
};
environment.systemPackages = [ dhcpcd ];
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
