From a8061ea05dfed6fc2e3497c552fae90d66de885e Mon Sep 17 00:00:00 2001 From: Antoine Viallon Date: Sun, 16 Apr 2023 22:37:16 +0200 Subject: [PATCH] [Filesystems] Don't enable kvdo by default Fails to build on kernel > 5.15 --- filesystems.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/filesystems.nix b/filesystems.nix index e0ee505..a0ac713 100644 --- a/filesystems.nix +++ b/filesystems.nix @@ -59,13 +59,16 @@ in services.lvm = mkIf cfg.lvm { boot.thin.enable = true; dmeventd.enable = true; - boot.vdo.enable = true; + boot.vdo.enable = config.aviallon.boot.kvdo.enable; }; boot.initrd.kernelModules = ifEnable cfg.lvm [ "dm-cache" "dm-cache-smq" "dm-cache-mq" "dm-cache-cleaner" ]; - boot.kernelModules = ifEnable cfg.lvm [ "dm-cache" "dm-cache-smq" "dm-persistent-data" "dm-bio-prison" "dm-clone" "dm-crypt" "dm-writecache" "dm-mirror" "dm-snapshot" "kvdo" ]; - + boot.kernelModules = [] + ++ optionals cfg.lvm [ "dm-cache" "dm-cache-smq" "dm-persistent-data" "dm-bio-prison" "dm-clone" "dm-crypt" "dm-writecache" "dm-mirror" "dm-snapshot" ] + ++ optionals config.aviallon.boot.kvdo.enable [ "kvdo" ] + ; + aviallon.boot.cmdline = { resume = mkIf (! isNull resumeDeviceLabel) (mkDefault "LABEL=${resumeDeviceLabel}"); };