Skip to content

Commit

Permalink
Merge branch 'pr-55088'
Browse files Browse the repository at this point in the history
* pr-55088:
  nixos/tasks/encrypted-devices: fix regression from #54637
  • Loading branch information
Ekleog committed Feb 3, 2019
2 parents 4bc42aa + 3674bdf commit 9cd7762
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions nixos/modules/tasks/encrypted-devices.nix
Expand Up @@ -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.&lt;name?&gt;.device</literal> to <literal>/dev/mapper/&lt;label&gt;</literal> to mount the unlocked device.";
};

options.keyFile = mkOption {
keyFile = mkOption {
default = null;
example = "/mnt-root/root/.swapkey";
type = types.nullOr types.str;
Expand Down

0 comments on commit 9cd7762

Please sign in to comment.