nixos ISO image: revert another part of 8ca33835ba

Changed files
+14 -28
nixos
modules
profiles
system
boot
tasks
filesystems
+5 -10
nixos/modules/profiles/all-hardware.nix
···
# The initrd has to contain any module that might be necessary for
# supporting the most important parts of HW like drives.
boot.initrd.availableKernelModules =
-
# SATA/PATA support.
-
lib.optionals (!platform.isAarch64) [ # not sure where else they're missing
"ahci"
-
"sata_sil24"
-
] ++ [
"ata_piix"
"sata_inic162x" "sata_nv" "sata_promise" "sata_qstor"
-
"sata_sil" "sata_sis" "sata_svw" "sata_sx4"
"sata_uli" "sata_via" "sata_vsc"
"pata_ali" "pata_amd" "pata_artop" "pata_atiixp" "pata_efar"
···
# Firewire support. Not tested.
"ohci1394" "sbp2"
-
] ++ lib.optionals (!platform.isAarch64) [ # not sure where else they're missing
# Virtio (QEMU, KVM etc.) support.
"virtio_net" "virtio_pci" "virtio_blk" "virtio_scsi" "virtio_balloon" "virtio_console"
-
] ++ [
# VMware support.
"mptspi" "vmxnet3" "vsock"
-
] ++ lib.optionals (!platform.isAarch64) [ # not sure where else they're missing
"vmw_vmci" "vmwgfx" "vmw_vsock_vmci_transport"
-
] ++ lib.optional platform.isx86 "vmw_balloon"
# Hyper-V support.
-
++ lib.optionals (!platform.isAarch64) [ # not sure where else they're missing
"hv_storvsc"
];
···
# The initrd has to contain any module that might be necessary for
# supporting the most important parts of HW like drives.
boot.initrd.availableKernelModules =
+
[ # 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_efar"
···
# Firewire support. Not tested.
"ohci1394" "sbp2"
# Virtio (QEMU, KVM etc.) support.
"virtio_net" "virtio_pci" "virtio_blk" "virtio_scsi" "virtio_balloon" "virtio_console"
# VMware support.
"mptspi" "vmxnet3" "vsock"
+
] ++ lib.optional platform.isx86 "vmw_balloon"
+
++ lib.optionals (!platform.isAarch64) [ # not sure where else they're missing
"vmw_vmci" "vmwgfx" "vmw_vsock_vmci_transport"
# Hyper-V support.
"hv_storvsc"
];
+7 -13
nixos/modules/system/boot/kernel.nix
···
config = mkMerge
[ (mkIf config.boot.initrd.enable {
-
boot.initrd.availableKernelModules = let
-
# Some modules apparently aren't present on our aarch64 (and maybe elsewhere).
-
maybeInitrdModules = lib.optionals (!pkgs.stdenv.hostPlatform.isAarch64);
-
in
-
# Note: most of these (especially the SATA/PATA modules)
# shouldn't be included by default since nixos-generate-config
# detects them, but I'm keeping them for now for backwards
# compatibility.
# Some SATA/PATA stuff.
-
maybeInitrdModules [ "ahci" ]
-
++ [
"sata_nv"
"sata_via"
"sata_sis"
"sata_uli"
"ata_piix"
"pata_marvell"
-
]
# Standard SCSI stuff.
-
++ maybeInitrdModules [ "sd_mod" ]
-
++ [ "sr_mod" ]
# SD cards and internal eMMC drives.
-
++ maybeInitrdModules [ "mmc_block" ]
# Support USB keyboards, in case the boot fails and we only have
# a USB keyboard, or for LUKS passphrase prompt.
-
++ [ "uhci_hcd" ]
-
++ maybeInitrdModules [
"ehci_hcd"
"ehci_pci"
"ohci_hcd"
···
config = mkMerge
[ (mkIf config.boot.initrd.enable {
+
boot.initrd.availableKernelModules =
+
[ # Note: most of these (especially the SATA/PATA modules)
# shouldn't be included by default since nixos-generate-config
# detects them, but I'm keeping them for now for backwards
# compatibility.
# Some SATA/PATA stuff.
+
"ahci"
"sata_nv"
"sata_via"
"sata_sis"
"sata_uli"
"ata_piix"
"pata_marvell"
# Standard SCSI stuff.
+
"sd_mod"
+
"sr_mod"
# SD cards and internal eMMC drives.
+
"mmc_block"
# Support USB keyboards, in case the boot fails and we only have
# a USB keyboard, or for LUKS passphrase prompt.
+
"uhci_hcd"
"ehci_hcd"
"ehci_pci"
"ohci_hcd"
+2 -5
nixos/modules/tasks/filesystems/ext.nix
···
-
{ pkgs, lib, ... }:
{
config = {
···
system.fsPackages = [ pkgs.e2fsprogs ];
# As of kernel 4.3, there is no separate ext3 driver (they're also handled by ext4.ko)
-
# No ext* modules are present on our aarch64, apparently (and maybe elsewhere).
-
boot.initrd.availableKernelModules =
-
lib.optionals (!pkgs.stdenv.hostPlatform.isAarch64)
-
[ "ext2" "ext4" ];
boot.initrd.extraUtilsCommands =
''
···
+
{ pkgs, ... }:
{
config = {
···
system.fsPackages = [ pkgs.e2fsprogs ];
# As of kernel 4.3, there is no separate ext3 driver (they're also handled by ext4.ko)
+
boot.initrd.availableKernelModules = [ "ext2" "ext4" ];
boot.initrd.extraUtilsCommands =
''