git.iko.soy/typeable/nixpkgs
on master help sign in
nixos ISO image: revert another part of 8ca33835ba
commit9e2880e5fa0cda607ad670cde12dc93735d2f97a authorVladimír Čunát <v@cunat.cz> dateWed 13 Jan 2021, 15:22 (6 years ago) parenta76f069
3 files changed+14−28
nixos/modules/profiles/all-hardware.nix+5−10 nixos/modules/system/boot/kernel.nix+7−13 nixos/modules/tasks/filesystems/ext.nix+2−5
nixos/modules/profiles/all-hardware.nix+5−10
@@ -12,15 +12,13 @@ in
1212 # The initrd has to contain any module that might be necessary for
1313 # supporting the most important parts of HW like drives.
1414 boot.initrd.availableKernelModules =
15− # SATA/PATA support.
16− lib.optionals (!platform.isAarch64) [ # not sure where else they're missing
15+ [ # SATA/PATA support.
1716 "ahci"
18− "sata_sil24"
19− ] ++ [
17+
2018 "ata_piix"
2119
2220 "sata_inic162x" "sata_nv" "sata_promise" "sata_qstor"
23− "sata_sil" "sata_sis" "sata_svw" "sata_sx4"
21+ "sata_sil" "sata_sil24" "sata_sis" "sata_svw" "sata_sx4"
2422 "sata_uli" "sata_via" "sata_vsc"
2523
2624 "pata_ali" "pata_amd" "pata_artop" "pata_atiixp" "pata_efar"
@@ -42,19 +40,16 @@ in
4240 # Firewire support. Not tested.
4341 "ohci1394" "sbp2"
4442
45− ] ++ lib.optionals (!platform.isAarch64) [ # not sure where else they're missing
4643 # Virtio (QEMU, KVM etc.) support.
4744 "virtio_net" "virtio_pci" "virtio_blk" "virtio_scsi" "virtio_balloon" "virtio_console"
48− ] ++ [
4945
5046 # VMware support.
5147 "mptspi" "vmxnet3" "vsock"
52− ] ++ lib.optionals (!platform.isAarch64) [ # not sure where else they're missing
53− "vmw_vmci" "vmwgfx" "vmw_vsock_vmci_transport"
5448 ] ++ lib.optional platform.isx86 "vmw_balloon"
49+ ++ lib.optionals (!platform.isAarch64) [ # not sure where else they're missing
50+ "vmw_vmci" "vmwgfx" "vmw_vsock_vmci_transport"
5551
5652 # Hyper-V support.
57− ++ lib.optionals (!platform.isAarch64) [ # not sure where else they're missing
5853 "hv_storvsc"
5954 ];
6055
nixos/modules/system/boot/kernel.nix+7−13
@@ -194,37 +194,31 @@ in
194194
195195 config = mkMerge
196196 [ (mkIf config.boot.initrd.enable {
197− boot.initrd.availableKernelModules = let
198− # Some modules apparently aren't present on our aarch64 (and maybe elsewhere).
199− maybeInitrdModules = lib.optionals (!pkgs.stdenv.hostPlatform.isAarch64);
200− in
201− # Note: most of these (especially the SATA/PATA modules)
197+ boot.initrd.availableKernelModules =
198+ [ # Note: most of these (especially the SATA/PATA modules)
202199 # shouldn't be included by default since nixos-generate-config
203200 # detects them, but I'm keeping them for now for backwards
204201 # compatibility.
205202
206203 # Some SATA/PATA stuff.
207− maybeInitrdModules [ "ahci" ]
208− ++ [
204+ "ahci"
209205 "sata_nv"
210206 "sata_via"
211207 "sata_sis"
212208 "sata_uli"
213209 "ata_piix"
214210 "pata_marvell"
215− ]
216211
217212 # Standard SCSI stuff.
218− ++ maybeInitrdModules [ "sd_mod" ]
219− ++ [ "sr_mod" ]
213+ "sd_mod"
214+ "sr_mod"
220215
221216 # SD cards and internal eMMC drives.
222− ++ maybeInitrdModules [ "mmc_block" ]
217+ "mmc_block"
223218
224219 # Support USB keyboards, in case the boot fails and we only have
225220 # a USB keyboard, or for LUKS passphrase prompt.
226− ++ [ "uhci_hcd" ]
227− ++ maybeInitrdModules [
221+ "uhci_hcd"
228222 "ehci_hcd"
229223 "ehci_pci"
230224 "ohci_hcd"
nixos/modules/tasks/filesystems/ext.nix+2−5
@@ -1,4 +1,4 @@
1−{ pkgs, lib, ... }:
1+{ pkgs, ... }:
22
33{
44 config = {
@@ -6,10 +6,7 @@
66 system.fsPackages = [ pkgs.e2fsprogs ];
77
88 # As of kernel 4.3, there is no separate ext3 driver (they're also handled by ext4.ko)
9− # No ext* modules are present on our aarch64, apparently (and maybe elsewhere).
10− boot.initrd.availableKernelModules =
11− lib.optionals (!pkgs.stdenv.hostPlatform.isAarch64)
12− [ "ext2" "ext4" ];
9+ boot.initrd.availableKernelModules = [ "ext2" "ext4" ];
1310
1411 boot.initrd.extraUtilsCommands =
1512 ''