[2351] 2009-06-21 Colin Watson <address@hidden>

[Robert Millan]

Revision: 2351
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2351
Author:   robertmh
Date:     2009-06-21 11:21:59 +0000 (Sun, 21 Jun 2009)
Log Message:
-----------
2009-06-21  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.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/util/grub-mkconfig.in
    trunk/grub2/util/grub.d/10_linux.in

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2009-06-20 14:32:53 UTC (rev 2350)
+++ trunk/grub2/ChangeLog       2009-06-21 11:21:59 UTC (rev 2351)
@@ -1,3 +1,10 @@
+2009-06-21  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-20  Robert Millan  <address@hidden>
 
        * util/i386/pc/grub-mkimage.c (main): Oops, free `output' only

Modified: trunk/grub2/util/grub-mkconfig.in
===================================================================
--- trunk/grub2/util/grub-mkconfig.in   2009-06-20 14:32:53 UTC (rev 2350)
+++ trunk/grub2/util/grub-mkconfig.in   2009-06-21 11:21:59 UTC (rev 2351)
@@ -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

Modified: trunk/grub2/util/grub.d/10_linux.in
===================================================================
--- trunk/grub2/util/grub.d/10_linux.in 2009-06-20 14:32:53 UTC (rev 2350)
+++ trunk/grub2/util/grub.d/10_linux.in 2009-06-21 11:21:59 UTC (rev 2351)
@@ -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