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

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

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2017-12-06 20:25:06 +02:00 committed by Tuomas Tynkkynen
parent 44326993f4
commit 95880aaf06
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/system/boot/kernel.nix
View File

@ -208,10 +208,11 @@ in
"usbhid" "usbhid"
"hid_generic" "hid_lenovo" "hid_apple" "hid_roccat" "hid_logitech_hidpp" "hid_generic" "hid_lenovo" "hid_apple" "hid_roccat" "hid_logitech_hidpp"
# Misc. keyboard stuff. ] ++ optionals (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [
# Misc. x86 keyboard stuff.
"pcips2" "atkbd" "i8042" "pcips2" "atkbd" "i8042"
# Needed by the stage 2 init script. # x86 RTC needed by the stage 2 init script.
"rtc_cmos" "rtc_cmos"
]; ];

3
pkgs/build-support/vm/default.nix
View File

@ -3,7 +3,8 @@
, img ? pkgs.stdenv.platform.kernelTarget , img ? pkgs.stdenv.platform.kernelTarget
, storeDir ? builtins.storeDir , storeDir ? builtins.storeDir
, rootModules ? , rootModules ?
[ "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_balloon" "virtio_rng" "ext4" "unix" "9p" "9pnet_virtio" "rtc_cmos" ] [ "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_balloon" "virtio_rng" "ext4" "unix" "9p" "9pnet_virtio" ]
++ pkgs.lib.optional (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) "rtc_cmos"
}: }:
with pkgs; with pkgs;