From 974a74ad4902a6069e2e4ddb3d33e5c28e8fb9d2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 4 Mar 2012 21:15:34 +0000
Subject: [PATCH] * enableWLAN -> wireless.enable.

svn path=/nixos/trunk/; revision=32788
---
 modules/installer/tools/nixos-option.sh  | 3 +--
 modules/profiles/installation-device.nix | 2 +-
 modules/virtualisation/qemu-vm.nix       | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/installer/tools/nixos-option.sh b/modules/installer/tools/nixos-option.sh
index e5c681f1a4ab..bafce7d5690e 100644
--- a/modules/installer/tools/nixos-option.sh
+++ b/modules/installer/tools/nixos-option.sh
@@ -242,8 +242,7 @@ if $generate; then
 
   networking = {
     # hostName = "nixos"; # Define your hostname.
-    interfaceMonitor.enable = true; # Watch for plugged cable.
-    enableWLAN = true;  # Enables Wireless.
+    wireless.enable = true;  # Enables Wireless.
   };
 
   # Add file system entries for each partition that you want to see mounted
diff --git a/modules/profiles/installation-device.nix b/modules/profiles/installation-device.nix
index 287b39ad7669..40daa10c8cee 100644
--- a/modules/profiles/installation-device.nix
+++ b/modules/profiles/installation-device.nix
@@ -155,7 +155,7 @@ in
     jobs.sshd.startOn = pkgs.lib.mkOverride 50 "";
 
     # Enable wpa_supplicant, but don't start it by default.
-    networking.enableWLAN = true;
+    networking.wireless.enable = true;
     jobs.wpa_supplicant.startOn = pkgs.lib.mkOverride 50 "";
   };
 }
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 9f6801e89cce..91ff1d594ba3 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -382,5 +382,5 @@ in
   services.mingetty.ttys = ttys ++ optional (!cfg.graphics) "ttyS0";
 
   # Wireless won't work in the VM.
-  networking.enableWLAN = mkOverride 50 false;
+  networking.wireless.enable = mkOverride 50 false;
 }