From 0d5c0f946fe5ef292a18a68108ae85652f4828ec Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 28 Feb 2008 12:10:05 +0000 Subject: [PATCH] Moved module list in a separat eexpression for easier maintenance svn path=/nixos/trunk/; revision=10885 --- configuration/live-dvd-X-no-soft.nix | 45 ++----------------------- configuration/live-dvd-X.nix | 3 ++ configuration/moduleList.nix | 43 +++++++++++++++++++++++ configuration/rescue-cd-replacement.nix | 45 ++----------------------- 4 files changed, 50 insertions(+), 86 deletions(-) create mode 100644 configuration/moduleList.nix diff --git a/configuration/live-dvd-X-no-soft.nix b/configuration/live-dvd-X-no-soft.nix index b65187f6712..2c69051a08f 100644 --- a/configuration/live-dvd-X-no-soft.nix +++ b/configuration/live-dvd-X-no-soft.nix @@ -53,49 +53,8 @@ in pkgs.module_aggregation [pkgs.kernel] ); - extraInitrdKernelModules = [ - # The initrd should contain any modules necessary for - # mounting the CD. - - # SATA/PATA support. - "ahci" - - "ata_piix" - - "sata_inic162x" "sata_nv" "sata_promise" "sata_qstor" - "sata_sil" "sata_sil24" "sata_sis" "sata_svw" "sata_sx4" - "sata_uli" "sata_via" "sata_vsc" - - "pata_ali" "pata_amd" "pata_artop" "pata_atiixp" - "pata_cs5520" "pata_cs5530" "pata_cs5535" "pata_efar" - "pata_hpt366" "pata_hpt37x" "pata_hpt3x2n" "pata_hpt3x3" - "pata_it8213" "pata_it821x" "pata_jmicron" "pata_marvell" - "pata_mpiix" "pata_netcell" "pata_ns87410" "pata_oldpiix" - "pata_pcmcia" "pata_pdc2027x" "pata_qdi" "pata_rz1000" - "pata_sc1200" "pata_serverworks" "pata_sil680" "pata_sis" - "pata_sl82c105" "pata_triflex" "pata_via" - # "pata_winbond" <-- causes timeouts in sd_mod - - # SCSI support (incomplete). - "3w-9xxx" "3w-xxxx" "aic79xx" "aic7xxx" "arcmsr" - - # USB support, especially for booting from USB CD-ROM - # drives. Also include USB keyboard support for when - # something goes wrong in stage 1. - "ehci_hcd" - "ohci_hcd" - "usbhid" - "usb_storage" - - # Firewire support. Not tested. - "ohci1394" "sbp2" - - # Wait for SCSI devices to appear. - "scsi_wait_scan" - - # Needed for live-CD operation. - "aufs" - ]; + extraInitrdKernelModules = + import ./moduleList.nix; packages = pkgs : [ pkgs.which diff --git a/configuration/live-dvd-X.nix b/configuration/live-dvd-X.nix index f0e925b9115..e7b7e9b2ad3 100644 --- a/configuration/live-dvd-X.nix +++ b/configuration/live-dvd-X.nix @@ -54,6 +54,9 @@ in [pkgs.kernel] ); + extraInitrdKernelModules = + import ./moduleList.nix; + packages = pkgs : [ pkgs.irssi pkgs.ltrace diff --git a/configuration/moduleList.nix b/configuration/moduleList.nix new file mode 100644 index 00000000000..0ae686811b0 --- /dev/null +++ b/configuration/moduleList.nix @@ -0,0 +1,43 @@ +[ + # The initrd should contain any modules necessary for + # mounting the CD. + + # SATA/PATA support. + "ahci" + + "ata_piix" + + "sata_inic162x" "sata_nv" "sata_promise" "sata_qstor" + "sata_sil" "sata_sil24" "sata_sis" "sata_svw" "sata_sx4" + "sata_uli" "sata_via" "sata_vsc" + + "pata_ali" "pata_amd" "pata_artop" "pata_atiixp" + "pata_cs5520" "pata_cs5530" "pata_cs5535" "pata_efar" + "pata_hpt366" "pata_hpt37x" "pata_hpt3x2n" "pata_hpt3x3" + "pata_it8213" "pata_it821x" "pata_jmicron" "pata_marvell" + "pata_mpiix" "pata_netcell" "pata_ns87410" "pata_oldpiix" + "pata_pcmcia" "pata_pdc2027x" "pata_qdi" "pata_rz1000" + "pata_sc1200" "pata_serverworks" "pata_sil680" "pata_sis" + "pata_sl82c105" "pata_triflex" "pata_via" + # "pata_winbond" <-- causes timeouts in sd_mod + + # SCSI support (incomplete). + "3w-9xxx" "3w-xxxx" "aic79xx" "aic7xxx" "arcmsr" + + # USB support, especially for booting from USB CD-ROM + # drives. Also include USB keyboard support for when + # something goes wrong in stage 1. + "ehci_hcd" + "ohci_hcd" + "usbhid" + "usb_storage" + + # Firewire support. Not tested. + "ohci1394" "sbp2" + + # Wait for SCSI devices to appear. + "scsi_wait_scan" + + # Needed for live-CD operation. + "aufs" +] diff --git a/configuration/rescue-cd-replacement.nix b/configuration/rescue-cd-replacement.nix index ad14447cbd9..5d9571a0082 100644 --- a/configuration/rescue-cd-replacement.nix +++ b/configuration/rescue-cd-replacement.nix @@ -15,49 +15,8 @@ in (isoFun { includeStdenv = false; includeBuildDeps = false; - extraInitrdKernelModules = [ - # The initrd should contain any modules necessary for - # mounting the CD. - - # SATA/PATA support. - "ahci" - - "ata_piix" - - "sata_inic162x" "sata_nv" "sata_promise" "sata_qstor" - "sata_sil" "sata_sil24" "sata_sis" "sata_svw" "sata_sx4" - "sata_uli" "sata_via" "sata_vsc" - - "pata_ali" "pata_amd" "pata_artop" "pata_atiixp" - "pata_cs5520" "pata_cs5530" "pata_cs5535" "pata_efar" - "pata_hpt366" "pata_hpt37x" "pata_hpt3x2n" "pata_hpt3x3" - "pata_it8213" "pata_it821x" "pata_jmicron" "pata_marvell" - "pata_mpiix" "pata_netcell" "pata_ns87410" "pata_oldpiix" - "pata_pcmcia" "pata_pdc2027x" "pata_qdi" "pata_rz1000" - "pata_sc1200" "pata_serverworks" "pata_sil680" "pata_sis" - "pata_sl82c105" "pata_triflex" "pata_via" - # "pata_winbond" <-- causes timeouts in sd_mod - - # SCSI support (incomplete). - "3w-9xxx" "3w-xxxx" "aic79xx" "aic7xxx" "arcmsr" - - # USB support, especially for booting from USB CD-ROM - # drives. Also include USB keyboard support for when - # something goes wrong in stage 1. - "ehci_hcd" - "ohci_hcd" - "usbhid" - "usb_storage" - - # Firewire support. Not tested. - "ohci1394" "sbp2" - - # Wait for SCSI devices to appear. - "scsi_wait_scan" - - # Needed for live-CD operation. - "aufs" - ]; + extraInitrdKernelModules = + import ./moduleList.nix; packages = pkgs: [ pkgs.vim pkgs.subversion # for nixos-checkout