diff options
author | Pierre Bourdon <delroth@gmail.com> | 2019-02-02 17:31:31 +0100 |
---|---|---|
committer | Pierre Bourdon <delroth@gmail.com> | 2019-02-02 17:31:31 +0100 |
commit | 3674bdf204a8d9b2ae800c0f35528a4084a7fc5e (patch) | |
tree | a9d84b06c2e8beace8b8691306a6edefd6f60d17 /nixos/modules/tasks/encrypted-devices.nix | |
parent | 0cb74f6f1400bc7550c1d2ab6a7ccb667b489678 (diff) | |
download | nixpkgs-3674bdf204a8d9b2ae800c0f35528a4084a7fc5e.tar nixpkgs-3674bdf204a8d9b2ae800c0f35528a4084a7fc5e.tar.gz nixpkgs-3674bdf204a8d9b2ae800c0f35528a4084a7fc5e.tar.bz2 nixpkgs-3674bdf204a8d9b2ae800c0f35528a4084a7fc5e.tar.lz nixpkgs-3674bdf204a8d9b2ae800c0f35528a4084a7fc5e.tar.xz nixpkgs-3674bdf204a8d9b2ae800c0f35528a4084a7fc5e.tar.zst nixpkgs-3674bdf204a8d9b2ae800c0f35528a4084a7fc5e.zip |
nixos/tasks/encrypted-devices: fix regression from #54637
27982b408e465554b8831f492362bc87ed0ec02a introduced a bug when refactoring the encrypted-devices module, causing some encrypted filesystem options to not be recognized anymore. See e.g. https://hydra.nixos.org/build/88145490
Diffstat (limited to 'nixos/modules/tasks/encrypted-devices.nix')
-rw-r--r-- | nixos/modules/tasks/encrypted-devices.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/tasks/encrypted-devices.nix b/nixos/modules/tasks/encrypted-devices.nix index 2ffbb877706..2c9231f5523 100644 --- a/nixos/modules/tasks/encrypted-devices.nix +++ b/nixos/modules/tasks/encrypted-devices.nix @@ -19,21 +19,21 @@ let description = "The block device is backed by an encrypted one, adds this device as a initrd luks entry."; }; - options.blkDev = mkOption { + blkDev = mkOption { default = null; example = "/dev/sda1"; type = types.nullOr types.str; description = "Location of the backing encrypted device."; }; - options.label = mkOption { + 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."; }; - options.keyFile = mkOption { + keyFile = mkOption { default = null; example = "/mnt-root/root/.swapkey"; type = types.nullOr types.str; |