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

gummiboot: Automatically disable GRUB

Browse Source
This commit is contained in:
Eelco Dolstra 2014-04-30 11:41:39 +02:00
parent e9be441b62
commit 9bb209a3bd
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/doc/manual/installation.xml
View File

@ -318,8 +318,7 @@ changes:
</listitem> </listitem>
<listitem> <listitem>
<para>You must set <option>boot.loader.gummiboot.enable</option> to <para>You must set <option>boot.loader.gummiboot.enable</option> to
<literal>true</literal>, and <option>boot.loader.grub.enable</option> <literal>true</literal>. <command>nixos-generate-config</command>
to <literal>false</literal>. <command>nixos-generate-config</command>
should do this automatically for new configurations when booted in should do this automatically for new configurations when booted in
UEFI mode.</para> UEFI mode.</para>
</listitem> </listitem>

1
nixos/modules/installer/tools/nixos-generate-config.pl
View File

@ -402,7 +402,6 @@ if ($showHardwareConfig) {
if (-e "/sys/firmware/efi/efivars") { if (-e "/sys/firmware/efi/efivars") {
$bootLoaderConfig = <<EOF; $bootLoaderConfig = <<EOF;
# Use the gummiboot efi boot loader. # Use the gummiboot efi boot loader.
boot.loader.grub.enable = false;
boot.loader.gummiboot.enable = true; boot.loader.gummiboot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
EOF EOF

2
nixos/modules/system/boot/loader/gummiboot/gummiboot.nix
View File

@ -54,6 +54,8 @@ in {
} }
]; ];
boot.loader.grub.enable = mkDefault false;
system = { system = {
build.installBootLoader = gummibootBuilder; build.installBootLoader = gummibootBuilder;

1
nixos/tests/installer.nix
View File

@ -45,7 +45,6 @@ let
]; ];
${if useEFI then '' ${if useEFI then ''
boot.loader.grub.enable = false;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
boot.loader.gummiboot.enable = true; boot.loader.gummiboot.enable = true;
'' else '' '' else ''