diff options
author | Nicolas Pierron <nicolas.b.pierron@gmail.com> | 2014-08-29 18:43:03 +0200 |
---|---|---|
committer | Nicolas Pierron <nicolas.b.pierron@gmail.com> | 2014-08-29 18:43:03 +0200 |
commit | 8c19690d99af8e25a58ce1a96ffda74340b88700 (patch) | |
tree | bea55a0a2b3494123a17f03409e4755564b24dad /nixos/modules/system/boot/luksroot.nix | |
parent | 43e52ef0017790d303db0758edb52c46ab6f545a (diff) | |
download | nixlib-8c19690d99af8e25a58ce1a96ffda74340b88700.tar nixlib-8c19690d99af8e25a58ce1a96ffda74340b88700.tar.gz nixlib-8c19690d99af8e25a58ce1a96ffda74340b88700.tar.bz2 nixlib-8c19690d99af8e25a58ce1a96ffda74340b88700.tar.lz nixlib-8c19690d99af8e25a58ce1a96ffda74340b88700.tar.xz nixlib-8c19690d99af8e25a58ce1a96ffda74340b88700.tar.zst nixlib-8c19690d99af8e25a58ce1a96ffda74340b88700.zip |
Remove useless use of optionSet.
Diffstat (limited to 'nixos/modules/system/boot/luksroot.nix')
-rw-r--r-- | nixos/modules/system/boot/luksroot.nix | 67 |
1 files changed, 33 insertions, 34 deletions
diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 68392e3cfe25..70ff1d588a36 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -342,40 +342,39 @@ in description = "Path where the ramfs used to update the LUKS key will be mounted in stage-1"; }; - storage = mkOption { - type = types.optionSet; - description = "Options related to the storing the salt"; - - options = { - device = mkOption { - default = "/dev/sda1"; - type = types.path; - description = '' - An unencrypted device that will temporarily be mounted in stage-1. - Must contain the current salt to create the challenge for this LUKS device. - ''; - }; - - fsType = mkOption { - default = "vfat"; - type = types.string; - description = "The filesystem of the unencrypted device"; - }; - - mountPoint = mkOption { - default = "/crypt-storage"; - type = types.string; - description = "Path where the unencrypted device will be mounted in stage-1"; - }; - - path = mkOption { - default = "/crypt-storage/default"; - type = types.string; - description = '' - Absolute path of the salt on the unencrypted device with - that device's root directory as "/". - ''; - }; + /* TODO: Add to the documentation of the current module: + + Options related to the storing the salt. + */ + storage = { + device = mkOption { + default = "/dev/sda1"; + type = types.path; + description = '' + An unencrypted device that will temporarily be mounted in stage-1. + Must contain the current salt to create the challenge for this LUKS device. + ''; + }; + + fsType = mkOption { + default = "vfat"; + type = types.string; + description = "The filesystem of the unencrypted device"; + }; + + mountPoint = mkOption { + default = "/crypt-storage"; + type = types.string; + description = "Path where the unencrypted device will be mounted in stage-1"; + }; + + path = mkOption { + default = "/crypt-storage/default"; + type = types.string; + description = '' + Absolute path of the salt on the unencrypted device with + that device's root directory as "/". + ''; }; }; }; |