grub2/0057-Fix-GRUB_DISABLE_SUBMENU-one-more-time.patch
Peter Jones f4c76c02ae Reconcile even harder, so that it actually works.
Signed-off-by: Peter Jones <pjones@redhat.com>
2015-07-22 13:12:37 -04:00

31 lines
951 B
Diff

From 0ad8b88186862b9f7c66b918c1682885ecd4cf65 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Thu, 4 Sep 2014 15:25:22 -0400
Subject: [PATCH 57/74] Fix GRUB_DISABLE_SUBMENU one more time.
Resolves: rhbz#1063414
Signed-off-by: Peter Jones <pjones@redhat.com>
---
util/grub.d/10_linux.in | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index a714340..358dd67 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -258,6 +258,10 @@ while [ "x$list" != "x" ] ; do
linux_root_device_thisversion=${GRUB_DEVICE}
fi
+ if [ "x${GRUB_DISABLE_SUBMENU}" = "xyes" ] || [ "x${GRUB_DISABLE_SUBMENU}" = "xy" ]; then
+ GRUB_DISABLE_SUBMENU="true"
+ fi
+
if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xtrue ]; then
linux_entry "${OS}" "${version}" simple \
"${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
--
2.4.3