diff options
| author | Julien Malka <julien@malka.sh> | 2023-12-04 15:21:16 +0000 |
|---|---|---|
| committer | Julien Malka <julien@malka.sh> | 2023-12-04 15:21:16 +0000 |
| commit | 28608b04486f5c9218ba6b74f347456253ea9f4f (patch) | |
| tree | 3aaf8f6638e875cbaf008b11e7deecd6dae1470c | |
| parent | 9b6b934949a02ef19868f76df0f5dbcef67a8278 (diff) | |
| download | nixlib-28608b04486f5c9218ba6b74f347456253ea9f4f.tar nixlib-28608b04486f5c9218ba6b74f347456253ea9f4f.tar.gz nixlib-28608b04486f5c9218ba6b74f347456253ea9f4f.tar.bz2 nixlib-28608b04486f5c9218ba6b74f347456253ea9f4f.tar.lz nixlib-28608b04486f5c9218ba6b74f347456253ea9f4f.tar.xz nixlib-28608b04486f5c9218ba6b74f347456253ea9f4f.tar.zst nixlib-28608b04486f5c9218ba6b74f347456253ea9f4f.zip | |
nixos/clevis: skip filesystem with null devices
| -rw-r--r-- | nixos/modules/tasks/filesystems/zfs.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 1879d76f1347..784040f0ce9e 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -17,7 +17,7 @@ let cfgZED = config.services.zfs.zed; selectModulePackage = package: config.boot.kernelPackages.${package.kernelModuleAttribute}; - clevisDatasets = map (e: e.device) (filter (e: (hasAttr e.device config.boot.initrd.clevis.devices) && e.fsType == "zfs" && (fsNeededForBoot e)) config.system.build.fileSystems); + clevisDatasets = map (e: e.device) (filter (e: e.device != null && (hasAttr e.device config.boot.initrd.clevis.devices) && e.fsType == "zfs" && (fsNeededForBoot e)) config.system.build.fileSystems); inInitrd = any (fs: fs == "zfs") config.boot.initrd.supportedFilesystems; |