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

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Vladimír Čunát
2019-09-02 23:25:24 +02:00
parent b291f2a995 12ae04518b
commit f21211ebfe
277 changed files with 4766 additions and 1895 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/system/boot/loader/grub/grub.nix
+6 -6
View File
@@ -8,7 +8,7 @@ let
efi = config.boot.loader.efi;
grubPkgs =
grubPkgs =
# Package set of targeted architecture
if cfg.forcei686 then pkgs.pkgsi686Linux else pkgs;
@@ -333,7 +333,7 @@ in
};
backgroundColor = mkOption {
type = types.nullOr types.string;
type = types.nullOr types.str;
example = "#7EBAE4";
default = null;
description = ''
@@ -399,7 +399,7 @@ in
example = "text";
type = types.str;
description = ''
The gfxpayload to pass to GRUB when loading a graphical boot interface under EFI.
The gfxpayload to pass to GRUB when loading a graphical boot interface under EFI.
'';
};
@@ -408,7 +408,7 @@ in
example = "keep";
type = types.str;
description = ''
The gfxpayload to pass to GRUB when loading a graphical boot interface under BIOS.
The gfxpayload to pass to GRUB when loading a graphical boot interface under BIOS.
'';
};
@@ -535,7 +535,7 @@ in
default = false;
type = types.bool;
description = ''
Whether to force the use of a ia32 boot loader on x64 systems. Required
Whether to force the use of a ia32 boot loader on x64 systems. Required
to install and run NixOS on 64bit x86 systems with 32bit (U)EFI.
'';
};
@@ -554,7 +554,7 @@ in
systemHasTPM = mkOption {
default = "";
example = "YES_TPM_is_activated";
type = types.string;
type = types.str;
description = ''
Assertion that the target system has an activated TPM. It is a safety
check before allowing the activation of 'trustedBoot.enable'. TrustedBoot