|
 |
c789522 |
From 6cd959a64f588e256f0ba17e31bf2720b9cdec88 Mon Sep 17 00:00:00 2001
|
|
|
f4c76c0 |
From: Prarit Bhargava <prarit@redhat.com>
|
|
|
f4c76c0 |
Date: Wed, 12 Mar 2014 10:58:16 -0400
|
|
|
63f1a98 |
Subject: [PATCH 078/250] Fix bad test on GRUB_DISABLE_SUBMENU.
|
|
|
f4c76c0 |
|
|
|
f4c76c0 |
The file /etc/grub.d/10_linux does
|
|
|
f4c76c0 |
|
|
|
f4c76c0 |
if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
|
|
|
f4c76c0 |
|
|
|
f4c76c0 |
when it should do
|
|
|
f4c76c0 |
|
|
|
f4c76c0 |
if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xtrue ]; then
|
|
|
f4c76c0 |
|
|
|
f4c76c0 |
which results in submenus in /boot/grub2/grub.cfg when
|
|
|
f4c76c0 |
GRUB_DISABLE_SUBMENU="yes".
|
|
|
f4c76c0 |
|
|
|
f4c76c0 |
Resolves: rhbz#1063414
|
|
|
f4c76c0 |
---
|
|
|
b9efc54 |
util/grub.d/10_linux.in | 6 +++++-
|
|
|
b9efc54 |
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
f4c76c0 |
|
|
|
f4c76c0 |
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
|
|
|
ec4acbb |
index de9044c7f28..cf6331f2a51 100644
|
|
|
f4c76c0 |
--- a/util/grub.d/10_linux.in
|
|
|
f4c76c0 |
+++ b/util/grub.d/10_linux.in
|
|
|
d9747d8 |
@@ -224,7 +224,11 @@ while [ "x$list" != "x" ] ; do
|
|
|
f4c76c0 |
linux_root_device_thisversion=${GRUB_DEVICE}
|
|
|
f4c76c0 |
fi
|
|
|
f4c76c0 |
|
|
|
f4c76c0 |
- if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
|
|
|
b9efc54 |
+ if [ "x${GRUB_DISABLE_SUBMENU}" = "xyes" ] || [ "x${GRUB_DISABLE_SUBMENU}" = "xy" ]; then
|
|
|
b9efc54 |
+ GRUB_DISABLE_SUBMENU="true"
|
|
|
b9efc54 |
+ fi
|
|
|
b9efc54 |
+
|
|
|
f4c76c0 |
+ if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xtrue ]; then
|
|
|
f4c76c0 |
linux_entry "${OS}" "${version}" simple \
|
|
|
f4c76c0 |
"${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
|
|
|
f4c76c0 |
|
|
|
f4c76c0 |
--
|
|
|
63f1a98 |
2.14.3
|
|
|
f4c76c0 |
|