Fixed kernel version to 5.10 to avoid problems and updated zfs

This commit is contained in:
Julien Malka 2022-04-01 10:42:32 +02:00
parent 1849156fd6
commit 08bde4af31
No known key found for this signature in database
GPG key ID: 3C68E13964FEA07F
3 changed files with 3 additions and 12 deletions

View file

@ -1,7 +1,7 @@
{ pkgs, config, lib, ... }:
{
boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "sd_mod" "sr_mod" ];
boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
boot.kernelPackages = pkgs.linuxPackages_5_10;
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ ];

View file

@ -6,7 +6,7 @@
boot.zfs.requestEncryptionCredentials = true;
boot.loader.grub.copyKernels = true;
boot.loader.grub.efiSupport = false;
boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
boot.kernelPackages = pkgs.linuxPackages_5_10;
boot.loader.grub.mirroredBoots = [
{ path = "/boot-1"; devices = [ "/dev/disk/by-id/ata-WDC_WD20EFRX-68EUZN0_WD-WCC4M1TVUVJV" ]; }

View file

@ -15,16 +15,7 @@ let
customizeZfs = zfs:
(zfs.override { enableMail = true; }).overrideAttrs (oldAttrs: {
patches = oldAttrs.patches ++
[
(pkgs.fetchpatch {
name = "notify-on-unavail-events.patch";
url = "https://github.com/openzfs/zfs/commit/f74604f2f0d76ee55b59f7ed332409fb128ec7e5.patch";
sha256 = "1v25ydkxxx704j0gdxzrxvw07gfhi7865grcm8b0zgz9kq0w8i8i";
})
];
});
(zfs.override { enableMail = true; });
hostName = cfg.name;
sendEmailEvent = { event }: ''