mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-28 07:44:52 +00:00
58fe9aa736
- Clean up the build a bit to make it faster - Make grubenv work right on UEFI machines Related: rhbz#1119943 - Sort debug and rescue kernels later than normal ones Related: rhbz#1065360 - Allow "fallback" to include entries by title as well as number. Related: rhbz#1026084 - Fix a segfault on aarch64. - Load arm with SB enabled if available. - Add some serial port options to GRUB_MODULES. Signed-off-by: Peter Jones <pjones@redhat.com>
30 lines
953 B
Diff
30 lines
953 B
Diff
From 9e12a6e3a1cbc5d4747cef1e5f1517337bddf593 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Thu, 4 Sep 2014 15:25:22 -0400
|
|
Subject: [PATCH 147/152] 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 ede7175..e8088a1 100644
|
|
--- a/util/grub.d/10_linux.in
|
|
+++ b/util/grub.d/10_linux.in
|
|
@@ -256,6 +256,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}"
|
|
--
|
|
1.9.3
|
|
|