movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

* Undo unintended commit.

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

2
modules/module-list.nix
View file

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

5
modules/services/networking/dhcpcd.nix
View file

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