diff options
author | Jörg Thalheim <joerg@thalheim.io> | 2018-08-13 19:47:30 +0200 |
---|---|---|
committer | Jörg Thalheim <joerg@thalheim.io> | 2018-08-13 19:53:50 +0200 |
commit | 43595c7884533769a68f92359ca13f06dd62af97 (patch) | |
tree | 95c0eab5685a772a0563455e1ac7c4dae4627a30 /nixos/modules/tasks | |
parent | a57c8579a84d77288fcb2908fbe9f32b94a20007 (diff) | |
download | nixlib-43595c7884533769a68f92359ca13f06dd62af97.tar nixlib-43595c7884533769a68f92359ca13f06dd62af97.tar.gz nixlib-43595c7884533769a68f92359ca13f06dd62af97.tar.bz2 nixlib-43595c7884533769a68f92359ca13f06dd62af97.tar.lz nixlib-43595c7884533769a68f92359ca13f06dd62af97.tar.xz nixlib-43595c7884533769a68f92359ca13f06dd62af97.tar.zst nixlib-43595c7884533769a68f92359ca13f06dd62af97.zip |
zfsLegacyCrypto: remove
This package was only mandatory for migration for people on zfsUnstable in nixos unstable.
Diffstat (limited to 'nixos/modules/tasks')
-rw-r--r-- | nixos/modules/tasks/filesystems/zfs.nix | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 7120856387ef..a7ed18a9bcda 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -23,11 +23,7 @@ let kernel = config.boot.kernelPackages; - packages = if config.boot.zfs.enableLegacyCrypto then { - spl = kernel.splLegacyCrypto; - zfs = kernel.zfsLegacyCrypto; - zfsUser = pkgs.zfsLegacyCrypto; - } else if config.boot.zfs.enableUnstable then { + packages = if config.boot.zfs.enableUnstable then { spl = kernel.splUnstable; zfs = kernel.zfsUnstable; zfsUser = pkgs.zfsUnstable; @@ -117,27 +113,6 @@ in ''; }; - enableLegacyCrypto = mkOption { - type = types.bool; - default = false; - description = '' - Enabling this option will allow you to continue to use the old format for - encrypted datasets. With the inclusion of stability patches the format of - encrypted datasets has changed. They can still be accessed and mounted but - in read-only mode mounted. It is highly recommended to convert them to - the new format. - - This option is only for convenience to people that cannot convert their - datasets to the new format yet and it will be removed in due time. - - For migration strategies from old format to this new one, check the Wiki: - https://nixos.wiki/wiki/NixOS_on_ZFS#Encrypted_Dataset_Format_Change - - See https://github.com/zfsonlinux/zfs/pull/6864 for more details about - the stability patches. - ''; - }; - extraPools = mkOption { type = types.listOf types.str; default = []; |