diff options
| author | Will Fancher <elvishjerricco@gmail.com> | 2024-06-24 14:47:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-24 14:47:55 -0400 |
| commit | 2893f56de08021cffd9b6b6dfc70fd9ccd51eb60 (patch) | |
| tree | 315781a91aa7b1e903e095592b9a844b7aa0f89f /nixos/modules/system | |
| parent | 2d8df0501051e1c7f1af7637988ef15d9ffe1d1d (diff) | |
| parent | 4df3c4c17b3622c2f3f2dc8bb877ac8470efc1c6 (diff) | |
Merge pull request #319359 from misuzu/clevis-zfs-fix
nixos/clevis: add support for parent encrypted zfs datasets
Diffstat (limited to 'nixos/modules/system')
| -rw-r--r-- | nixos/modules/system/boot/clevis.nix | 2 |
1 files changed, 1 insertions, 1 deletions
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.''; }) |