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

Add 2 index file to define the default case for detected and not-detected

Browse Source 
devices.  These are used to replace hand made listings in the basic
installation CD.

The configuration file, which is generated by nixos-hardware-scan, enables
not-detected devices by default.

svn path=/nixos/trunk/; revision=23911
This commit is contained in:
Nicolas Pierron 2010-09-25 09:32:37 +00:00
parent c90a7b9be4
commit cf103b8d4d
4 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,6 +75,11 @@ in
./memtest.nix ./memtest.nix
./iso-image.nix ./iso-image.nix
../../profiles/base.nix ../../profiles/base.nix
# Enable devices which are usually scanned, because we don't know the
# target system.
../scan/detected.nix
../scan/not-detected.nix
]; ];
# ISO naming. # ISO naming.
@ -134,11 +139,6 @@ in
} }
''; '';
# Include the firmware for various wireless cards.
networking.enableRT73Firmware = true;
networking.enableIntel2200BGFirmware = true;
networking.enableIntel3945ABGFirmware = true;
# To speed up installation a little bit, include the complete stdenv # To speed up installation a little bit, include the complete stdenv
# in the Nix store on the CD. # in the Nix store on the CD.
isoImage.storeContents = [ pkgs.stdenv pkgs.klibc pkgs.klibcShrunk ]; isoImage.storeContents = [ pkgs.stdenv pkgs.klibc pkgs.klibcShrunk ];

13
modules/installer/scan/detected.nix Normal file
View File

@ -0,0 +1,13 @@
# List all devices which are detected by nixos-hardware-scan.
# Common devices are enabled by default.
{config, pkgs, ...}:
with pkgs.lib;
{
config = mkDefault {
# Wireless card firmware
networking.enableIntel2200BGFirmware = true;
networking.enableIntel3945ABGFirmware = true;
};
}

12
modules/installer/scan/not-detected.nix Normal file
View File

@ -0,0 +1,12 @@
# List all devices which are _not_ detected by nixos-hardware-scan.
# Common devices are enabled by default.
{config, pkgs, ...}:
with pkgs.lib;
{
config = mkDefault {
# Wireless card firmware
networking.enableRT73Firmware = true;
};
}

6
modules/installer/tools/nixos-hardware-scan.pl
View File

@ -227,7 +227,13 @@ my $attrs = multiLineList(" ", removeDups @attrs);
print <<EOF ; print <<EOF ;
# This is a generated file. Do not modify! # This is a generated file. Do not modify!
# Make changes to /etc/nixos/configuration.nix instead. # Make changes to /etc/nixos/configuration.nix instead.
{modulesPath, ...}:
{ {
require = [
"\${modulesPath}/installer/scan/not-detected.nix"
];
boot.initrd.kernelModules = [ $initrdKernelModules ]; boot.initrd.kernelModules = [ $initrdKernelModules ];
boot.kernelModules = [ $kernelModules ]; boot.kernelModules = [ $kernelModules ];