* Enable wpa_supplicant on the installation CD.

svn path=/nixos/trunk/; revision=23034
This commit is contained in:
Eelco Dolstra 2010-08-08 13:55:35 +00:00
parent 622a7d3d46
commit cbc05c1480
3 changed files with 5 additions and 3 deletions

View file

@ -47,7 +47,6 @@ let
pkgs.sshfsFuse
pkgs.socat
pkgs.screen
pkgs.wpa_supplicant # !!! should use the wpa module
# Hardware-related tools.
pkgs.sdparm
@ -249,4 +248,8 @@ in
# 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 {} "";
}

View file

@ -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

View file

@ -10,7 +10,6 @@
# Include lots of packages.
environment.systemPackages =
[ pkgs.utillinuxCurses
pkgs.wpa_supplicant
pkgs.upstartJobControl
pkgs.iproute
pkgs.bc