Author: eelco
Date: Mon Feb 20 14:29:21 2012
New Revision: 32428
URL: https://nixos.org/websvn/nix/?rev=32428&sc=1
Log:
* Use the networking.useDHCP out of the dhclient module.
Modified:
nixos/trunk/modules/services/networking/dhclient.nix
nixos/trunk/modules/services/networking/dhcpcd.nix
nixos/trunk/modules/tasks/network-interfaces.nix
Modified: nixos/trunk/modules/services/networking/dhclient.nix
==============================================================================
--- nixos/trunk/modules/services/networking/dhclient.nix Mon Feb 20
14:26:01 2012 (r32427)
+++ nixos/trunk/modules/services/networking/dhclient.nix Mon Feb 20
14:29:21 2012 (r32428)
@@ -40,23 +40,6 @@
{
- ###### 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 {
Modified: nixos/trunk/modules/services/networking/dhcpcd.nix
==============================================================================
--- nixos/trunk/modules/services/networking/dhcpcd.nix Mon Feb 20 14:26:01
2012 (r32427)
+++ nixos/trunk/modules/services/networking/dhcpcd.nix Mon Feb 20 14:29:21
2012 (r32428)
@@ -39,23 +39,6 @@
{
- ###### 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 {
Modified: nixos/trunk/modules/tasks/network-interfaces.nix
==============================================================================
--- nixos/trunk/modules/tasks/network-interfaces.nix Mon Feb 20 14:26:01
2012 (r32427)
+++ nixos/trunk/modules/tasks/network-interfaces.nix Mon Feb 20 14:29:21
2012 (r32428)
@@ -163,6 +163,16 @@
};
+ 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.
+ '';
+ };
+
};
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
