about summary refs log tree commit diff
path: root/nixos/modules/tasks/filesystems
diff options
context:
space:
mode:
authorSilvan Mosberger <infinisil@icloud.com>2019-06-21 03:33:09 +0200
committerSilvan Mosberger <infinisil@icloud.com>2019-06-21 03:33:09 +0200
commit852fe410fc11eb7f8ad36cd2eb048a08668d8035 (patch)
tree54c2fb9cb9223725a246cba4e3bf4184fea12a24 /nixos/modules/tasks/filesystems
parent282041fb7b2cc0fcc031cedfd66b2fbf880fa6ee (diff)
downloadnixlib-852fe410fc11eb7f8ad36cd2eb048a08668d8035.tar
nixlib-852fe410fc11eb7f8ad36cd2eb048a08668d8035.tar.gz
nixlib-852fe410fc11eb7f8ad36cd2eb048a08668d8035.tar.bz2
nixlib-852fe410fc11eb7f8ad36cd2eb048a08668d8035.tar.lz
nixlib-852fe410fc11eb7f8ad36cd2eb048a08668d8035.tar.xz
nixlib-852fe410fc11eb7f8ad36cd2eb048a08668d8035.tar.zst
nixlib-852fe410fc11eb7f8ad36cd2eb048a08668d8035.zip
nixos/zfs: Remove requestEncryptionCredentials assertion
zfs >= 0.8 supporting encryption is now stable
Diffstat (limited to 'nixos/modules/tasks/filesystems')
-rw-r--r--nixos/modules/tasks/filesystems/zfs.nix4
1 files changed, 0 insertions, 4 deletions
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index 93bbd141284d..22578b012608 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -314,10 +314,6 @@ in
           assertion = !cfgZfs.forceImportAll || cfgZfs.forceImportRoot;
           message = "If you enable boot.zfs.forceImportAll, you must also enable boot.zfs.forceImportRoot";
         }
-        {
-          assertion = cfgZfs.requestEncryptionCredentials -> cfgZfs.enableUnstable;
-          message = "This feature is only available for zfs unstable. Set the NixOS option boot.zfs.enableUnstable.";
-        }
       ];
 
       virtualisation.lxd.zfsSupport = true;