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