Author: eelco
Date: Sun Aug 8 13:55:35 2010
New Revision: 23034
URL: https://svn.nixos.org/websvn/nix/?rev=23034&sc=1
Log:
* Enable wpa_supplicant on the installation CD.
Modified:
nixos/trunk/modules/installer/cd-dvd/installation-cd-base.nix
nixos/trunk/modules/installer/cd-dvd/installation-cd-rescue.nix
nixos/trunk/modules/installer/cd-dvd/live-dvd.nix
Modified: nixos/trunk/modules/installer/cd-dvd/installation-cd-base.nix
==============================================================================
--- nixos/trunk/modules/installer/cd-dvd/installation-cd-base.nix Sun Aug
8 12:39:00 2010 (r23033)
+++ nixos/trunk/modules/installer/cd-dvd/installation-cd-base.nix Sun Aug
8 13:55:35 2010 (r23034)
@@ -47,7 +47,6 @@
pkgs.sshfsFuse
pkgs.socat
pkgs.screen
- pkgs.wpa_supplicant # !!! should use the wpa module
# Hardware-related tools.
pkgs.sdparm
@@ -249,4 +248,8 @@
# default root password is empty.
services.openssh.enable = true;
jobs.sshd.startOn = pkgs.lib.mkOverride 50 {} "";
+
+ # Enable wpa_supplicant, but don't start it by default.
+ networking.enableWLAN = true;
+ jobs.wpa_supplicant.startOn = pkgs.lib.mkOverride 50 {} "";
}
Modified: nixos/trunk/modules/installer/cd-dvd/installation-cd-rescue.nix
==============================================================================
--- nixos/trunk/modules/installer/cd-dvd/installation-cd-rescue.nix Sun Aug
8 12:39:00 2010 (r23033)
+++ nixos/trunk/modules/installer/cd-dvd/installation-cd-rescue.nix Sun Aug
8 13:55:35 2010 (r23034)
@@ -20,7 +20,7 @@
utillinuxCurses ddrescue
pciutils sdparm hdparm hddtemp usbutils
btrfsProgs xfsprogs jfsutils jfsrec
- wpa_supplicant iproute
+ iproute
fuse ntfs3g smbfsFuse sshfsFuse
manpages irssi elinks mcabber mutt openssh lftp
openssl ncat socat
Modified: nixos/trunk/modules/installer/cd-dvd/live-dvd.nix
==============================================================================
--- nixos/trunk/modules/installer/cd-dvd/live-dvd.nix Sun Aug 8 12:39:00
2010 (r23033)
+++ nixos/trunk/modules/installer/cd-dvd/live-dvd.nix Sun Aug 8 13:55:35
2010 (r23034)
@@ -10,7 +10,6 @@
# Include lots of packages.
environment.systemPackages =
[ pkgs.utillinuxCurses
- pkgs.wpa_supplicant
pkgs.upstartJobControl
pkgs.iproute
pkgs.bc
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
