diff options
| author | Ivan Jager <aij+git@mrph.org> | 2019-07-04 16:11:52 -0500 |
|---|---|---|
| committer | Ivan Jager <aij+git@mrph.org> | 2019-07-04 16:11:52 -0500 |
| commit | a38449f15999b031c6a84a8e979cd21115586c71 (patch) | |
| tree | a15ab8ee82bc7289f9659ee55445aa0129551c52 /nixos/modules/tasks/filesystems/zfs.nix | |
| parent | 73392e79aa62e406683d6a732eb4f4101f4732be (diff) | |
| download | nixpkgs-a38449f15999b031c6a84a8e979cd21115586c71.tar nixpkgs-a38449f15999b031c6a84a8e979cd21115586c71.tar.gz nixpkgs-a38449f15999b031c6a84a8e979cd21115586c71.tar.bz2 nixpkgs-a38449f15999b031c6a84a8e979cd21115586c71.tar.lz nixpkgs-a38449f15999b031c6a84a8e979cd21115586c71.tar.xz nixpkgs-a38449f15999b031c6a84a8e979cd21115586c71.tar.zst nixpkgs-a38449f15999b031c6a84a8e979cd21115586c71.zip | |
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
Diffstat (limited to 'nixos/modules/tasks/filesystems/zfs.nix')
| -rw-r--r-- | nixos/modules/tasks/filesystems/zfs.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 22578b01260..f7f07bad952 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 |