[PATCH] Support GRUB_DISABLE_LINUX_RECOVERY

[Colin Watson]

This patch fixes
https://bugs.launchpad.net/ubuntu/+source/grub2/+bug/190207.

Index: ChangeLog
===================================================================
--- ChangeLog   (revision 2335)
+++ ChangeLog   (working copy)
@@ -1,5 +1,10 @@
+2009-06-17  Colin Watson  <address@hidden>
+
+       * util/grub-mkconfig.in (GRUB_DISABLE_LINUX_RECOVERY): Export
+       variable.
+       * util/grub.d/10_linux.in: If GRUB_DISABLE_LINUX_RECOVERY is true,
+       don't write a menu entry for recovery mode.
+
 2009-06-17  Colin Watson  <address@hidden>
 
        * util/elf/grub-mkimage.c (usage): Prefix each option line with two
Index: util/grub-mkconfig.in
===================================================================
--- util/grub-mkconfig.in       (revision 2335)
+++ util/grub-mkconfig.in       (working copy)
@@ -173,7 +173,7 @@
 export GRUB_DEVICE GRUB_DEVICE_UUID GRUB_DEVICE_BOOT GRUB_DEVICE_BOOT_UUID 
GRUB_FS GRUB_FONT_PATH GRUB_PRELOAD_MODULES
 
 # These are optional, user-defined variables.
-export GRUB_DEFAULT GRUB_TIMEOUT GRUB_DISTRIBUTOR GRUB_CMDLINE_LINUX 
GRUB_CMDLINE_LINUX_DEFAULT GRUB_TERMINAL_INPUT GRUB_TERMINAL_OUTPUT 
GRUB_SERIAL_COMMAND GRUB_DISABLE_LINUX_UUID GRUB_GFXMODE
+export GRUB_DEFAULT GRUB_TIMEOUT GRUB_DISTRIBUTOR GRUB_CMDLINE_LINUX 
GRUB_CMDLINE_LINUX_DEFAULT GRUB_TERMINAL_INPUT GRUB_TERMINAL_OUTPUT 
GRUB_SERIAL_COMMAND GRUB_DISABLE_LINUX_UUID GRUB_DISABLE_LINUX_RECOVERY 
GRUB_GFXMODE
 
 if test "x${grub_cfg}" != "x"; then
   rm -f ${grub_cfg}.new
Index: util/grub.d/10_linux.in
===================================================================
--- util/grub.d/10_linux.in     (revision 2335)
+++ util/grub.d/10_linux.in     (working copy)
@@ -143,8 +143,10 @@
 
   linux_entry "${OS}, Linux ${version}" \
       "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
-  linux_entry "${OS}, Linux ${version} (recovery mode)" \
-      "single ${GRUB_CMDLINE_LINUX}"
+  if [ "x${GRUB_DISABLE_LINUX_RECOVERY}" != "xtrue" ]; then
+    linux_entry "${OS}, Linux ${version} (recovery mode)" \
+       "single ${GRUB_CMDLINE_LINUX}"
+  fi
 
   list=`echo $list | tr ' ' '\n' | grep -vx $linux | tr '\n' ' '`
 done

Thanks,

-- 
Colin Watson                                       address@hidden