diff options
author | danbst <abcz2.uprola@gmail.com> | 2019-01-26 21:44:05 +0200 |
---|---|---|
committer | danbst <abcz2.uprola@gmail.com> | 2019-01-31 00:41:10 +0200 |
commit | 27982b408e465554b8831f492362bc87ed0ec02a (patch) | |
tree | 9d91ef0747a5e1ed4a425e3e86a1b7172a8a16e4 /nixos/modules/tasks/encrypted-devices.nix | |
parent | aa2e63ce5ed6e24d73eaefe61489ece46f7460d7 (diff) | |
download | nixpkgs-27982b408e465554b8831f492362bc87ed0ec02a.tar nixpkgs-27982b408e465554b8831f492362bc87ed0ec02a.tar.gz nixpkgs-27982b408e465554b8831f492362bc87ed0ec02a.tar.bz2 nixpkgs-27982b408e465554b8831f492362bc87ed0ec02a.tar.lz nixpkgs-27982b408e465554b8831f492362bc87ed0ec02a.tar.xz nixpkgs-27982b408e465554b8831f492362bc87ed0ec02a.tar.zst nixpkgs-27982b408e465554b8831f492362bc87ed0ec02a.zip |
types.optionSet: deprecate and remove last usages
Diffstat (limited to 'nixos/modules/tasks/encrypted-devices.nix')
-rw-r--r-- | nixos/modules/tasks/encrypted-devices.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nixos/modules/tasks/encrypted-devices.nix b/nixos/modules/tasks/encrypted-devices.nix index 11ed5d7e4d0..2ffbb877706 100644 --- a/nixos/modules/tasks/encrypted-devices.nix +++ b/nixos/modules/tasks/encrypted-devices.nix @@ -12,28 +12,28 @@ let encryptedFSOptions = { - encrypted = { + options.encrypted = { enable = mkOption { default = false; type = types.bool; description = "The block device is backed by an encrypted one, adds this device as a initrd luks entry."; }; - blkDev = mkOption { + options.blkDev = mkOption { default = null; example = "/dev/sda1"; type = types.nullOr types.str; description = "Location of the backing encrypted device."; }; - label = mkOption { + options.label = mkOption { default = null; example = "rootfs"; type = types.nullOr types.str; description = "Label of the unlocked encrypted device. Set <literal>fileSystems.<name?>.device</literal> to <literal>/dev/mapper/<label></literal> to mount the unlocked device."; }; - keyFile = mkOption { + options.keyFile = mkOption { default = null; example = "/mnt-root/root/.swapkey"; type = types.nullOr types.str; @@ -47,10 +47,10 @@ in options = { fileSystems = mkOption { - options = [encryptedFSOptions]; + type = with lib.types; loaOf (submodule encryptedFSOptions); }; swapDevices = mkOption { - options = [encryptedFSOptions]; + type = with lib.types; listOf (submodule encryptedFSOptions); }; }; |