Skip to contentSkip to conversation

Support GRUB_DISABLE_LINUX_RECOVERY

PATCH In review Colin Watson 2 participants 2 messages Jun 17, 2009 – Jun 21, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Support GRUB_DISABLE_LINUX_RECOVERY

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

ChangeLog +7 -0
Index: ChangeLog
===================================================================
@@ -1,5 +1,10 @@
+2009-06-17  Colin Watson  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* util/elf/grub-mkimage.c (usage): Prefix each option line with two
grub-mkconfig.in +1 -1
Index: util/grub-mkconfig.in
===================================================================
@@ -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
grub.d/10_linux.in +4 -2
Index: util/grub.d/10_linux.in
===================================================================
@@ -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,

Signature · 1 line
Colin Watson                                       [[email protected]]
#1 lore raw

Committed, as this is small enough not to be copyright-significant.

Btw, Colin please use inline attachments in the future. It makes it easier to manage.

Quoted 60 lines · Colin Watson

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

Index: ChangeLog
===================================================================

ChangeLog +7 -0
@@ -1,5 +1,10 @@
+2009-06-17  Colin Watson  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* util/elf/grub-mkimage.c (usage): Prefix each option line with two

Index: util/grub-mkconfig.in
===================================================================

grub-mkconfig.in +1 -1
@@ -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
===================================================================

grub.d/10_linux.in +4 -2
@@ -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,

Signature · 7 lines
Colin Watson                                       [[email protected]]


_______________________________________________
Grub-devel mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/grub-devel
Signature · 5 lines
Robert Millan

  The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and
  how) you may access your data; but nobody's threatening your freedom: we
  still allow you to remove your data and not access it at all."