b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

* Use the networking.useDHCP out of the dhclient module.

Browse source 
svn path=/nixos/trunk/; revision=32428
This commit is contained in:
Eelco Dolstra 2012-02-20 14:29:21 +00:00
parent 7278e37072
commit a46fd58b3d
3 changed files with 10 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
modules/services/networking/dhclient.nix
View file

@ -40,23 +40,6 @@ in
{
###### interface
options = {
networking.useDHCP = mkOption {
default = true;
merge = mergeEnableOption;
description = "
Whether to use DHCP to obtain an IP adress and other
configuration for all network interfaces that are not manually
configured.
";
};
};
###### implementation
config = mkIf config.networking.useDHCP {

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

@ -39,23 +39,6 @@ in
{
###### interface
options = {
networking.useDHCP = mkOption {
default = true;
merge = mergeEnableOption;
description = "
Whether to use DHCP to obtain an IP adress and other
configuration for all network interfaces that are not manually
configured.
";
};
};
###### implementation
config = mkIf config.networking.useDHCP {

10
modules/tasks/network-interfaces.nix
View file

@ -163,6 +163,16 @@ in
};
networking.useDHCP = mkOption {
default = true;
merge = mergeEnableOption;
description = ''
Whether to use DHCP to obtain an IP adress and other
configuration for all network interfaces that are not manually
configured.
'';
};
};