Author: eelco
Date: Sun Mar 4 21:15:34 2012
New Revision: 32788
URL: https://nixos.org/websvn/nix/?rev=32788&sc=1
Log:
* enableWLAN -> wireless.enable.
Modified:
nixos/trunk/modules/installer/tools/nixos-option.sh
nixos/trunk/modules/profiles/installation-device.nix
nixos/trunk/modules/virtualisation/qemu-vm.nix
Modified: nixos/trunk/modules/installer/tools/nixos-option.sh
==============================================================================
--- nixos/trunk/modules/installer/tools/nixos-option.sh Sun Mar 4 21:13:52
2012 (r32787)
+++ nixos/trunk/modules/installer/tools/nixos-option.sh Sun Mar 4 21:15:34
2012 (r32788)
@@ -242,8 +242,7 @@
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
Modified: nixos/trunk/modules/profiles/installation-device.nix
==============================================================================
--- nixos/trunk/modules/profiles/installation-device.nix Sun Mar 4
21:13:52 2012 (r32787)
+++ nixos/trunk/modules/profiles/installation-device.nix Sun Mar 4
21:15:34 2012 (r32788)
@@ -155,7 +155,7 @@
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 "";
};
}
Modified: nixos/trunk/modules/virtualisation/qemu-vm.nix
==============================================================================
--- nixos/trunk/modules/virtualisation/qemu-vm.nix Sun Mar 4 21:13:52
2012 (r32787)
+++ nixos/trunk/modules/virtualisation/qemu-vm.nix Sun Mar 4 21:15:34
2012 (r32788)
@@ -382,5 +382,5 @@
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;
}
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
