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

* Move some kernel modules around.

Browse Source 
svn path=/nixos/trunk/; revision=19187
This commit is contained in:
Eelco Dolstra 2010-01-03 16:29:17 +00:00
parent 4378018164
commit 21216b0461
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -125,25 +125,20 @@ in
"sata_uli" "sata_via" "sata_vsc" "sata_uli" "sata_via" "sata_vsc"
"pata_ali" "pata_amd" "pata_artop" "pata_atiixp" "pata_ali" "pata_amd" "pata_artop" "pata_atiixp"
"pata_cs5520" "pata_cs5530" /* "pata_cs5535" */ "pata_efar" "pata_cs5520" "pata_cs5530" "pata_cs5535" "pata_efar"
"pata_hpt366" "pata_hpt37x" "pata_hpt3x2n" "pata_hpt3x3" "pata_hpt366" "pata_hpt37x" "pata_hpt3x2n" "pata_hpt3x3"
"pata_it8213" "pata_it821x" "pata_jmicron" "pata_marvell" "pata_it8213" "pata_it821x" "pata_jmicron" "pata_marvell"
"pata_mpiix" "pata_netcell" "pata_ns87410" "pata_oldpiix" "pata_mpiix" "pata_netcell" "pata_ns87410" "pata_oldpiix"
"pata_pcmcia" "pata_pdc2027x" /* "pata_qdi" */ "pata_rz1000" "pata_pcmcia" "pata_pdc2027x" "pata_qdi" "pata_rz1000"
"pata_sc1200" "pata_serverworks" "pata_sil680" "pata_sis" "pata_sc1200" "pata_serverworks" "pata_sil680" "pata_sis"
"pata_sl82c105" "pata_triflex" "pata_via" "pata_sl82c105" "pata_triflex" "pata_via"
# "pata_winbond" <-- causes timeouts in sd_mod "pata_winbond"
# SCSI support (incomplete). # SCSI support (incomplete).
"3w-9xxx" "3w-xxxx" "aic79xx" "aic7xxx" "arcmsr" "3w-9xxx" "3w-xxxx" "aic79xx" "aic7xxx" "arcmsr"
# USB support, especially for booting from USB CD-ROM # USB support, especially for booting from USB CD-ROM
# drives. Also include USB keyboard support for when # drives.
# something goes wrong in stage 1.
"ehci_hcd"
"ohci_hcd"
"uhci_hcd"
"usbhid"
"usb_storage" "usb_storage"
# Firewire support. Not tested. # Firewire support. Not tested.
@ -152,18 +147,15 @@ in
# Virtio (QEMU, KVM etc.) support. # Virtio (QEMU, KVM etc.) support.
"virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon"
# Wait for SCSI devices to appear.
"scsi_wait_scan"
# Add vfat to enable people to copy the contents of the CD to a # Add vfat to enable people to copy the contents of the CD to a
# bootable USB stick. # bootable USB stick.
"vfat" "vfat"
# And of course we need to be able to mount the CD.
"iso9660"
]; ];
boot.initrd.kernelModules = [ "loop" ]; boot.initrd.kernelModules =
[ # Wait for SCSI devices to appear.
"scsi_wait_scan"
];
# nixos-install will do a pull from this channel to speed up the # nixos-install will do a pull from this channel to speed up the
# installation. # installation.

4
modules/installer/cd-dvd/iso-image.nix
View File

@ -128,8 +128,10 @@ in
(! config.boot.kernelPackages.kernel.features ? aufs) (! config.boot.kernelPackages.kernel.features ? aufs)
config.boot.kernelPackages.aufs; config.boot.kernelPackages.aufs;
boot.initrd.availableKernelModules = [ "aufs" "squashfs" ]; boot.initrd.availableKernelModules = [ "aufs" "squashfs" "iso9660" ];
boot.initrd.kernelModules = [ "loop" ];
# Tell stage 1 of the boot to mount a tmpfs on top of the CD using # Tell stage 1 of the boot to mount a tmpfs on top of the CD using
# AUFS. !!! It would be nicer to make the stage 1 init pluggable # AUFS. !!! It would be nicer to make the stage 1 init pluggable
# and move that bit of code here. # and move that bit of code here.