From 4a69bb6f5e2de2d0af680374a7d43f78c75c7a0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 3 Jan 2023 00:20:51 +0100 Subject: [PATCH] Remove zfs options now in nixos-modules --- hosts/hydra/default.nix | 1 - hosts/server10/default.nix | 1 - hosts/server8/default.nix | 1 - modules/microvm-host.nix | 2 -- 4 files changed, 5 deletions(-) diff --git a/hosts/hydra/default.nix b/hosts/hydra/default.nix index 205d5712..aa5a2e81 100644 --- a/hosts/hydra/default.nix +++ b/hosts/hydra/default.nix @@ -16,7 +16,6 @@ in boot = { tmpOnTmpfs = true; tmpOnTmpfsSize = "80%"; - kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages; kernelModules = [ "kvm-intel" ]; kernelParams = [ "mitigations=off" "preempt=none" ]; loader = { diff --git a/hosts/server10/default.nix b/hosts/server10/default.nix index 98cfc8de..0ef9d371 100644 --- a/hosts/server10/default.nix +++ b/hosts/server10/default.nix @@ -40,7 +40,6 @@ services = { openssh.enable = true; smartd.enable = true; - zfs.autoScrub.enable = true; # reserve resources for legacy MicroVMs nomad.settings.client.reserved = { diff --git a/hosts/server8/default.nix b/hosts/server8/default.nix index 1368e8b0..6faaa3b5 100644 --- a/hosts/server8/default.nix +++ b/hosts/server8/default.nix @@ -34,7 +34,6 @@ services = { openssh.enable = true; smartd.enable = true; - zfs.autoScrub.enable = true; }; simd.arch = "westmere"; diff --git a/modules/microvm-host.nix b/modules/microvm-host.nix index faf7209c..c6ca0b68 100644 --- a/modules/microvm-host.nix +++ b/modules/microvm-host.nix @@ -8,8 +8,6 @@ }; config = { - boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages; - # just all the microvms from this flake # that are supposed to run on the server microvm.autostart =