public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Enable wpa_supplicant on the installation CD.

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/installer/cd-dvd/installation-cd-base.nix
View File

@ -47,7 +47,6 @@ let
pkgs.sshfsFuse pkgs.sshfsFuse
pkgs.socat pkgs.socat
pkgs.screen pkgs.screen
pkgs.wpa_supplicant # !!! should use the wpa module
# Hardware-related tools. # Hardware-related tools.
pkgs.sdparm pkgs.sdparm
@ -249,4 +248,8 @@ in
# default root password is empty. # default root password is empty.
services.openssh.enable = true; services.openssh.enable = true;
jobs.sshd.startOn = pkgs.lib.mkOverride 50 {} ""; 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 {} "";
} }

2
modules/installer/cd-dvd/installation-cd-rescue.nix
View File

@ -20,7 +20,7 @@
utillinuxCurses ddrescue utillinuxCurses ddrescue
pciutils sdparm hdparm hddtemp usbutils pciutils sdparm hdparm hddtemp usbutils
btrfsProgs xfsprogs jfsutils jfsrec btrfsProgs xfsprogs jfsutils jfsrec
wpa_supplicant iproute iproute
fuse ntfs3g smbfsFuse sshfsFuse fuse ntfs3g smbfsFuse sshfsFuse
manpages irssi elinks mcabber mutt openssh lftp manpages irssi elinks mcabber mutt openssh lftp
openssl ncat socat openssl ncat socat

1
modules/installer/cd-dvd/live-dvd.nix
View File

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