public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

luksroot module: optionSet -> submodule

Browse Source
This commit is contained in:
Eric Sagnes 2016-09-11 18:58:26 +09:00
parent 55e437806a
commit 96f5788346
1 changed files with 156 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nixos/modules/system/boot/luksroot.nix
View File

@ -236,9 +236,8 @@ in
<filename>/dev/mapper/<replaceable>name</replaceable></filename>. <filename>/dev/mapper/<replaceable>name</replaceable></filename>.
''; '';
type = types.loaOf types.optionSet; type = with types; loaOf (submodule (
{ name, ... }: { options = {
options = { name, ... }: { options = {
name = mkOption { name = mkOption {
visible = false; visible = false;
@ -307,12 +306,12 @@ in
yubikey = mkOption { yubikey = mkOption {
default = null; default = null;
type = types.nullOr types.optionSet;
description = '' description = ''
The options to use for this LUKS device in Yubikey-PBA. The options to use for this LUKS device in Yubikey-PBA.
If null (the default), Yubikey-PBA will be disabled for this device. If null (the default), Yubikey-PBA will be disabled for this device.
''; '';
type = with types; nullOr (submodule {
options = { options = {
twoFactor = mkOption { twoFactor = mkOption {
default = true; default = true;
@ -392,9 +391,10 @@ in
}; };
}; };
}; };
});
}; };
}; }; }; }));
}; };
boot.initrd.luks.yubikeySupport = mkOption { boot.initrd.luks.yubikeySupport = mkOption {