From 4df3c4c17b3622c2f3f2dc8bb877ac8470efc1c6 Mon Sep 17 00:00:00 2001 From: misuzu Date: Wed, 12 Jun 2024 20:06:38 +0300 Subject: nixos/clevis: add support for parent encrypted zfs datasets --- nixos/modules/system/boot/clevis.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nixos/modules/system') diff --git a/nixos/modules/system/boot/clevis.nix b/nixos/modules/system/boot/clevis.nix index d9390f5bc15f8..ac881e9535767 100644 --- a/nixos/modules/system/boot/clevis.nix +++ b/nixos/modules/system/boot/clevis.nix @@ -48,7 +48,7 @@ in assertions = (attrValues (mapAttrs (device: _: { - assertion = (any (fs: fs.device == device && (elem fs.fsType supportedFs)) config.system.build.fileSystems) || (hasAttr device config.boot.initrd.luks.devices); + assertion = (any (fs: fs.device == device && (elem fs.fsType supportedFs) || (fs.fsType == "zfs" && hasPrefix "${device}/" fs.device)) config.system.build.fileSystems) || (hasAttr device config.boot.initrd.luks.devices); message = '' No filesystem or LUKS device with the name ${device} is declared in your configuration.''; }) -- cgit 1.4.1