From a46fd58b3d021d648d23e17d6c925030dc288982 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Feb 2012 14:29:21 +0000
Subject: [PATCH] * Use the networking.useDHCP out of the dhclient module.

svn path=/nixos/trunk/; revision=32428
---
 modules/services/networking/dhclient.nix | 17 -----------------
 modules/services/networking/dhcpcd.nix   | 17 -----------------
 modules/tasks/network-interfaces.nix     | 10 ++++++++++
 3 files changed, 10 insertions(+), 34 deletions(-)

diff --git a/modules/services/networking/dhclient.nix b/modules/services/networking/dhclient.nix
index fe118fb320e3..2bc0b333a6fc 100644
--- a/modules/services/networking/dhclient.nix
+++ b/modules/services/networking/dhclient.nix
@@ -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 {
diff --git a/modules/services/networking/dhcpcd.nix b/modules/services/networking/dhcpcd.nix
index 465802e6b482..f80aac9bdc43 100644
--- a/modules/services/networking/dhcpcd.nix
+++ b/modules/services/networking/dhcpcd.nix
@@ -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 {
diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index e13fbff0ce64..b9c5d897295b 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -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.
+      '';
+    };
+
   };