summary refs log tree commit diff
path: root/modules/tasks/network-interfaces.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2012-02-20 14:29:21 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2012-02-20 14:29:21 +0000
commita46fd58b3d021d648d23e17d6c925030dc288982 (patch)
tree82d47d2b0572c411a81ae46e4178cacfce624539 /modules/tasks/network-interfaces.nix
parent7278e370722fec09a281985c2c1392ee3ea7b007 (diff)
downloadnixpkgs-a46fd58b3d021d648d23e17d6c925030dc288982.tar
nixpkgs-a46fd58b3d021d648d23e17d6c925030dc288982.tar.gz
nixpkgs-a46fd58b3d021d648d23e17d6c925030dc288982.tar.bz2
nixpkgs-a46fd58b3d021d648d23e17d6c925030dc288982.tar.lz
nixpkgs-a46fd58b3d021d648d23e17d6c925030dc288982.tar.xz
nixpkgs-a46fd58b3d021d648d23e17d6c925030dc288982.tar.zst
nixpkgs-a46fd58b3d021d648d23e17d6c925030dc288982.zip
* Use the networking.useDHCP out of the dhclient module.
svn path=/nixos/trunk/; revision=32428
Diffstat (limited to 'modules/tasks/network-interfaces.nix')
-rw-r--r--modules/tasks/network-interfaces.nix10
1 files changed, 10 insertions, 0 deletions
diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index e13fbff0ce6..b9c5d897295 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.
+      '';
+    };
+
   };