You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
42 lines
1.3 KiB
42 lines
1.3 KiB
7 years ago
|
From 4d363cc16d83a499ea1b14212e77e9e9c79d4984 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Prarit Bhargava <prarit@redhat.com>
|
||
|
|
Date: Wed, 12 Mar 2014 10:58:16 -0400
|
||
|
|
Subject: [PATCH 135/237] Fix bad test on GRUB_DISABLE_SUBMENU.
|
||
|
|
|
||
|
|
The file /etc/grub.d/10_linux does
|
||
|
|
|
||
|
|
if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
|
||
|
|
|
||
|
|
when it should do
|
||
|
|
|
||
|
|
if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xtrue ]; then
|
||
|
|
|
||
|
|
which results in submenus in /boot/grub2/grub.cfg when
|
||
|
|
GRUB_DISABLE_SUBMENU="yes".
|
||
|
|
|
||
|
|
Resolves: rhbz#1063414
|
||
|
|
---
|
||
|
|
util/grub.d/10_linux.in | 6 +++++-
|
||
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
|
||
|
|
index 136abd7..767093c 100644
|
||
|
|
--- a/util/grub.d/10_linux.in
|
||
|
|
+++ b/util/grub.d/10_linux.in
|
||
|
|
@@ -255,7 +255,11 @@ while [ "x$list" != "x" ] ; do
|
||
|
|
linux_root_device_thisversion=${GRUB_DEVICE}
|
||
|
|
fi
|
||
|
|
|
||
|
|
- if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
|
||
|
|
+ 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.9.3
|
||
|
|
|