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

* Determine networking.enableIntel3945ABGFirmware.

Browse Source 
svn path=/nixos/trunk/; revision=10490
This commit is contained in:
Eelco Dolstra 2008-02-04 10:39:06 +00:00
parent 57a01e7733
commit c30e7b0f13
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
installer/nixos-hardware-scan.pl
View File

@ -51,6 +51,7 @@ push @kernelModules, "kvm-amd" if hasCPUFeature "svm";
# However, some are needed in the initrd to boot the system. # However, some are needed in the initrd to boot the system.
my $enableIntel2200BGFirmware = "false"; my $enableIntel2200BGFirmware = "false";
my $enableIntel3945ABGFirmware = "false";
my $videoDriver = "vesa"; my $videoDriver = "vesa";
sub pciCheck { sub pciCheck {
@ -94,6 +95,10 @@ sub pciCheck {
($device eq "0x1043" || $device eq "0x104f" || $device eq "0x4220" || ($device eq "0x1043" || $device eq "0x104f" || $device eq "0x4220" ||
$device eq "0x4221" || $device eq "0x4223" || $device eq "0x4224"); $device eq "0x4221" || $device eq "0x4223" || $device eq "0x4224");
$enableIntel3945ABGFirmware = "true" if $vendor eq "0x8086" &&
($device eq "0x4229" || $device eq "0x4230" ||
$device eq "0x4222" || $device eq "0x4227");
# Hm, can we extract the PCI ids supported by X drivers somehow? # Hm, can we extract the PCI ids supported by X drivers somehow?
# cf. http://www.calel.org/pci-devices/xorg-device-list.html # cf. http://www.calel.org/pci-devices/xorg-device-list.html
$videoDriver = "i810" if $vendor eq "0x8086" && $videoDriver = "i810" if $vendor eq "0x8086" &&
@ -206,6 +211,8 @@ print <<EOF ;
}; };
networking = { networking = {
enableIntel3945ABGFirmware = $enableIntel3945ABGFirmware;
# Warning: setting this option to `true' requires acceptance of the # Warning: setting this option to `true' requires acceptance of the
# firmware license, see http://ipw2200.sourceforge.net/firmware.php?fid=7. # firmware license, see http://ipw2200.sourceforge.net/firmware.php?fid=7.
enableIntel2200BGFirmware = $enableIntel2200BGFirmware; enableIntel2200BGFirmware = $enableIntel2200BGFirmware;

2
system/options.nix
View File

@ -352,7 +352,7 @@
default = false; default = false;
description = " description = "
This option enables automatic loading of the firmware for the Intel This option enables automatic loading of the firmware for the Intel
PRO/Wireless 3945ABG. PRO/Wireless 3945ABG / 4965AGN.
"; ";
}; };