From 9bb209a3bdc6299fae90f372e7cc516c59c1aee5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 30 Apr 2014 11:41:39 +0200
Subject: [PATCH] gummiboot: Automatically disable GRUB

---
 nixos/doc/manual/installation.xml                        | 3 +--
 nixos/modules/installer/tools/nixos-generate-config.pl   | 1 -
 nixos/modules/system/boot/loader/gummiboot/gummiboot.nix | 2 ++
 nixos/tests/installer.nix                                | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/nixos/doc/manual/installation.xml b/nixos/doc/manual/installation.xml
index 6cf69386e564..dcbb20b19eed 100644
--- a/nixos/doc/manual/installation.xml
+++ b/nixos/doc/manual/installation.xml
@@ -318,8 +318,7 @@ changes:
   </listitem>
   <listitem>
     <para>You must set <option>boot.loader.gummiboot.enable</option> to
-    <literal>true</literal>, and <option>boot.loader.grub.enable</option>
-    to <literal>false</literal>. <command>nixos-generate-config</command>
+    <literal>true</literal>. <command>nixos-generate-config</command>
     should do this automatically for new configurations when booted in
     UEFI mode.</para>
   </listitem>
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index b1958f32e55c..c4d25a67a0f9 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -402,7 +402,6 @@ if ($showHardwareConfig) {
         if (-e "/sys/firmware/efi/efivars") {
             $bootLoaderConfig = <<EOF;
   # Use the gummiboot efi boot loader.
-  boot.loader.grub.enable = false;
   boot.loader.gummiboot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 EOF
diff --git a/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix b/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix
index 19c613a7c94c..e7a481e90a79 100644
--- a/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix
+++ b/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix
@@ -54,6 +54,8 @@ in {
       }
     ];
 
+    boot.loader.grub.enable = mkDefault false;
+
     system = {
       build.installBootLoader = gummibootBuilder;
 
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index d453633bed0e..726656071496 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -45,7 +45,6 @@ let
           ];
 
         ${if useEFI then ''
-          boot.loader.grub.enable = false;
           boot.loader.efi.canTouchEfiVariables = true;
           boot.loader.gummiboot.enable = true;
         '' else ''