* Use the networking.useDHCP out of the dhclient module.
svn path=/nixos/trunk/; revision=32428
This commit is contained in:
parent
7278e37072
commit
a46fd58b3d
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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.
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue