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

…cted

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

modules/installer/cd-dvd/installation-cd-base.nix

@@ -75,6 +75,11 @@ in
       ./memtest.nix
       ./iso-image.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.
@@ -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
   # in the Nix store on the CD.
   isoImage.storeContents = [ pkgs.stdenv pkgs.klibc pkgs.klibcShrunk ];

modules/installer/scan/detected.nix

@@ -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;
+  };
+}

modules/installer/scan/not-detected.nix

@@ -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;
+  };
+}

modules/installer/tools/nixos-hardware-scan.pl

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