From 63e9ece771d476aa857cb2459f2cdcd1bdc0f580 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 17 Jul 2011 11:42:44 +0000
Subject: [PATCH] =?UTF-8?q?*=20Support=20booting=20into=20another=20GRUB?=
 =?UTF-8?q?=20boot=20entry=20via=20=E2=80=98grub-reboot=E2=80=99.=20=20=20?=
 =?UTF-8?q?This=20requires=20grub.conf=20to=20honour=20the=20saved=5Fentry?=
 =?UTF-8?q?=20GRUB=20environment=20=20=20variable.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

svn path=/nixos/trunk/; revision=27807
---
 modules/installer/grub/grub-menu-builder.sh | 23 +++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/modules/installer/grub/grub-menu-builder.sh b/modules/installer/grub/grub-menu-builder.sh
index 1c5deab43aa..dfe19a9ffe6 100644
--- a/modules/installer/grub/grub-menu-builder.sh
+++ b/modules/installer/grub/grub-menu-builder.sh
@@ -59,8 +59,27 @@ GRUBEND
             cp -f @grub@/share/grub/unicode.pf2 /boot/grub/unicode.pf2
 	    cat > "$1" <<EOF
 # Automatically generated.  DO NOT EDIT THIS FILE!
-set default=@default@
-set timeout=@timeout@
+
+if [ -s \$prefix/grubenv ]; then
+  load_env
+fi
+
+# ‘grub-reboot’ sets a one-time saved entry, which we process here and
+# then delete.
+if [ "\${saved_entry}" ]; then
+  # The next line *has* to look exactly like this, otherwise KDM's
+  # reboot feature won't work properly with GRUB 2.
+  set default="\${saved_entry}"
+  set saved_entry=
+  set prev_saved_entry=
+  save_env saved_entry
+  save_env prev_saved_entry
+  set timeout=1
+else
+  set default=@default@
+  set timeout=@timeout@
+fi
+
 if loadfont $bootRoot/grub/unicode.pf2; then
   set gfxmode=640x480
   insmod gfxterm