nixos/initrd: Don't include some x86-specific modules unconditionally

authored by Tuomas Tynkkynen and committed by Tuomas Tynkkynen 95880aaf 44326993

+5 -3
+3 -2
nixos/modules/system/boot/kernel.nix
··· 208 208 "usbhid" 209 209 "hid_generic" "hid_lenovo" "hid_apple" "hid_roccat" "hid_logitech_hidpp" 210 210 211 - # Misc. keyboard stuff. 211 + ] ++ optionals (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [ 212 + # Misc. x86 keyboard stuff. 212 213 "pcips2" "atkbd" "i8042" 213 214 214 - # Needed by the stage 2 init script. 215 + # x86 RTC needed by the stage 2 init script. 215 216 "rtc_cmos" 216 217 ]; 217 218
+2 -1
pkgs/build-support/vm/default.nix
··· 3 3 , img ? pkgs.stdenv.platform.kernelTarget 4 4 , storeDir ? builtins.storeDir 5 5 , rootModules ? 6 - [ "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_balloon" "virtio_rng" "ext4" "unix" "9p" "9pnet_virtio" "rtc_cmos" ] 6 + [ "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_balloon" "virtio_rng" "ext4" "unix" "9p" "9pnet_virtio" ] 7 + ++ pkgs.lib.optional (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) "rtc_cmos" 7 8 }: 8 9 9 10 with pkgs;