dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

various: remove left-over rtc_cmos rootModule (#359416)

Browse Source
This commit is contained in:
Will Fancher 2024-11-27 15:49:12 -05:00 committed by GitHub
commit 357a340019
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/lib/make-multi-disk-zfs-image.nix
View File

@ -236,8 +236,7 @@ let
image = ( image = (
pkgs.vmTools.override { pkgs.vmTools.override {
rootModules = rootModules =
[ "zfs" "9p" "9pnet_virtio" "virtio_pci" "virtio_blk" ] ++ [ "zfs" "9p" "9pnet_virtio" "virtio_pci" "virtio_blk" ];
(pkgs.lib.optional pkgs.stdenv.hostPlatform.isx86 "rtc_cmos");
kernel = modulesTree; kernel = modulesTree;
} }
).runInLinuxVM ( ).runInLinuxVM (

3
nixos/lib/make-single-disk-zfs-image.nix
View File

@ -226,8 +226,7 @@ let
image = ( image = (
pkgs.vmTools.override { pkgs.vmTools.override {
rootModules = rootModules =
[ "zfs" "9p" "9pnet_virtio" "virtio_pci" "virtio_blk" ] ++ [ "zfs" "9p" "9pnet_virtio" "virtio_pci" "virtio_blk" ];
(pkgs.lib.optional pkgs.stdenv.hostPlatform.isx86 "rtc_cmos");
kernel = modulesTree; kernel = modulesTree;
} }
).runInLinuxVM ( ).runInLinuxVM (

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

@ -306,9 +306,6 @@ in
] ++ optionals pkgs.stdenv.hostPlatform.isx86 [ ] ++ optionals pkgs.stdenv.hostPlatform.isx86 [
# Misc. x86 keyboard stuff. # Misc. x86 keyboard stuff.
"pcips2" "atkbd" "i8042" "pcips2" "atkbd" "i8042"
# x86 RTC needed by the stage 2 init script.
"rtc_cmos"
]); ]);
boot.initrd.kernelModules = boot.initrd.kernelModules =

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

@ -6,7 +6,6 @@
, storeDir ? builtins.storeDir , storeDir ? builtins.storeDir
, rootModules ? , rootModules ?
[ "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_balloon" "virtio_rng" "ext4" "unix" "9p" "9pnet_virtio" "crc32c_generic" ] [ "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_balloon" "virtio_rng" "ext4" "unix" "9p" "9pnet_virtio" "crc32c_generic" ]
++ pkgs.lib.optional pkgs.stdenv.hostPlatform.isx86 "rtc_cmos"
}: }:
let let