From a38449f15999b031c6a84a8e979cd21115586c71 Mon Sep 17 00:00:00 2001 From: Ivan Jager Date: Thu, 4 Jul 2019 16:11:52 -0500 Subject: [PATCH] nixos/zfs: enable requestEncryptionCredentials by default Since zfsStable now supports encryption, it no longer makes sense to set the default based on whether we're using zfsUnstable --- nixos/modules/tasks/filesystems/zfs.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 22578b01260812..f7f07bad952233 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -179,10 +179,9 @@ in requestEncryptionCredentials = mkOption { type = types.bool; - default = config.boot.zfs.enableUnstable; + default = true; description = '' Request encryption keys or passwords for all encrypted datasets on import. - Dataset encryption is only supported in zfsUnstable at the moment. For root pools the encryption key can be supplied via both an interactive prompt (keylocation=prompt) and from a file (keylocation=file://). Note that for data pools the encryption key can