diff options
author | Joachim F <joachifm@users.noreply.github.com> | 2016-10-01 17:57:45 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-01 17:57:45 +0200 |
commit | 7e80c42b0ead918defafb92893c605983319e418 (patch) | |
tree | 057bf37267cf75493af45cf9e92f3337b5b55e80 /nixos/modules/system/boot/loader/grub/grub.nix | |
parent | 46693bd6e824ead3cf46c3deace190969a249010 (diff) | |
parent | f9239053465d06a823268c962505d3327049f12a (diff) | |
download | nixlib-7e80c42b0ead918defafb92893c605983319e418.tar nixlib-7e80c42b0ead918defafb92893c605983319e418.tar.gz nixlib-7e80c42b0ead918defafb92893c605983319e418.tar.bz2 nixlib-7e80c42b0ead918defafb92893c605983319e418.tar.lz nixlib-7e80c42b0ead918defafb92893c605983319e418.tar.xz nixlib-7e80c42b0ead918defafb92893c605983319e418.tar.zst nixlib-7e80c42b0ead918defafb92893c605983319e418.zip |
Merge pull request #18511 from ericsagnes/feat/remove-optionSet
modules: optionSet -> submodule
Diffstat (limited to 'nixos/modules/system/boot/loader/grub/grub.nix')
-rw-r--r-- | nixos/modules/system/boot/loader/grub/grub.nix | 86 |
1 files changed, 43 insertions, 43 deletions
diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index cae045f78c37..c3be7407d592 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -131,51 +131,51 @@ in to the respective devices corresponding to those partitions. ''; - type = types.listOf types.optionSet; + type = with types; listOf (submodule { + options = { + + path = mkOption { + example = "/boot1"; + type = types.str; + description = '' + The path to the boot directory where GRUB will be written. Generally + this boot path should double as an EFI path. + ''; + }; + + efiSysMountPoint = mkOption { + default = null; + example = "/boot1/efi"; + type = types.nullOr types.str; + description = '' + The path to the efi system mount point. Usually this is the same + partition as the above path and can be left as null. + ''; + }; + + efiBootloaderId = mkOption { + default = null; + example = "NixOS-fsid"; + type = types.nullOr types.str; + description = '' + The id of the bootloader to store in efi nvram. + The default is to name it NixOS and append the path or efiSysMountPoint. + This is only used if <literal>boot.loader.efi.canTouchEfiVariables</literal> is true. + ''; + }; + + devices = mkOption { + default = [ ]; + example = [ "/dev/sda" "/dev/sdb" ]; + type = types.listOf types.str; + description = '' + The path to the devices which will have the GRUB MBR written. + Note these are typically device paths and not paths to partitions. + ''; + }; - options = { - - path = mkOption { - example = "/boot1"; - type = types.str; - description = '' - The path to the boot directory where GRUB will be written. Generally - this boot path should double as an EFI path. - ''; - }; - - efiSysMountPoint = mkOption { - default = null; - example = "/boot1/efi"; - type = types.nullOr types.str; - description = '' - The path to the efi system mount point. Usually this is the same - partition as the above path and can be left as null. - ''; - }; - - efiBootloaderId = mkOption { - default = null; - example = "NixOS-fsid"; - type = types.nullOr types.str; - description = '' - The id of the bootloader to store in efi nvram. - The default is to name it NixOS and append the path or efiSysMountPoint. - This is only used if <literal>boot.loader.efi.canTouchEfiVariables</literal> is true. - ''; }; - - devices = mkOption { - default = [ ]; - example = [ "/dev/sda" "/dev/sdb" ]; - type = types.listOf types.str; - description = '' - The path to the devices which will have the GRUB MBR written. - Note these are typically device paths and not paths to partitions. - ''; - }; - - }; + }); }; configurationName = mkOption { |