public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #63598 from Infinisil/zfs-assertion

Browse Source 
nixos/zfs: Remove requestEncryptionCredentials assertion
This commit is contained in:
Jörg Thalheim 2019-06-21 11:01:47 +01:00 committed by GitHub
commit 5c12bac7cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/tasks/filesystems/zfs.nix
View File

@ -314,10 +314,6 @@ in
assertion = !cfgZfs.forceImportAll || cfgZfs.forceImportRoot; assertion = !cfgZfs.forceImportAll || cfgZfs.forceImportRoot;
message = "If you enable boot.zfs.forceImportAll, you must also enable boot.zfs.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; virtualisation.lxd.zfsSupport = true;