|
 |
f725e3 |
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
f725e3 |
From: Peter Jones <pjones@redhat.com>
|
|
|
f725e3 |
Date: Thu, 25 Aug 2016 14:15:29 -0400
|
|
|
f725e3 |
Subject: [PATCH] Export grub-get-kernel-settings variables
|
|
|
f725e3 |
|
|
|
f725e3 |
Without this export, the generators for various configs never get the
|
|
|
f725e3 |
setting.
|
|
|
f725e3 |
|
|
|
f725e3 |
Related: rhbz#1226325
|
|
|
f725e3 |
|
|
|
f725e3 |
Signed-off-by: Peter Jones <example@example.com>
|
|
|
f725e3 |
---
|
|
|
f725e3 |
util/grub-get-kernel-settings.in | 3 +++
|
|
|
f725e3 |
util/grub.d/10_linux.in | 6 +++---
|
|
|
f725e3 |
2 files changed, 6 insertions(+), 3 deletions(-)
|
|
|
f725e3 |
|
|
|
f725e3 |
diff --git a/util/grub-get-kernel-settings.in b/util/grub-get-kernel-settings.in
|
|
|
f725e3 |
index 6a68a0ef664..12046219878 100644
|
|
|
f725e3 |
--- a/util/grub-get-kernel-settings.in
|
|
|
f725e3 |
+++ b/util/grub-get-kernel-settings.in
|
|
|
f725e3 |
@@ -70,6 +70,9 @@ fi
|
|
|
f725e3 |
|
|
|
f725e3 |
if [ "$MAKEDEBUG" = "yes" ]; then
|
|
|
f725e3 |
echo GRUB_LINUX_MAKE_DEBUG=true
|
|
|
f725e3 |
+ echo export GRUB_LINUX_MAKE_DEBUG
|
|
|
f725e3 |
echo GRUB_CMDLINE_LINUX_DEBUG=\"systemd.log_level=debug systemd.log_target=kmsg\"
|
|
|
f725e3 |
+ echo export GRUB_CMDLINE_LINUX_DEBUG
|
|
|
f725e3 |
echo GRUB_LINUX_DEBUG_TITLE_POSTFIX=\" with debugging\"
|
|
|
f725e3 |
+ echo export GRUB_LINUX_DEBUG_TITLE_POSTFIX
|
|
|
f725e3 |
fi
|
|
|
f725e3 |
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
|
|
|
f725e3 |
index 0d0086d3b6a..bf0fb727bcd 100644
|
|
|
f725e3 |
--- a/util/grub.d/10_linux.in
|
|
|
f725e3 |
+++ b/util/grub.d/10_linux.in
|
|
|
f725e3 |
@@ -127,13 +127,13 @@ linux_entry ()
|
|
|
f725e3 |
quoted="$(echo "$GRUB_ACTUAL_DEFAULT" | grub_quote)"
|
|
|
f725e3 |
title_correction_code="${title_correction_code}if [ \"x\$default\" = '$quoted' ]; then default='$(echo "$replacement_title" | grub_quote)'; fi;"
|
|
|
f725e3 |
fi
|
|
|
f725e3 |
+ if [ x$isdebug = xdebug ]; then
|
|
|
f725e3 |
+ title="$title${GRUB_LINUX_DEBUG_TITLE_POSTFIX}"
|
|
|
f725e3 |
+ fi
|
|
|
f725e3 |
echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-$version-$type-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
|
|
|
f725e3 |
else
|
|
|
f725e3 |
echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
|
|
|
f725e3 |
fi
|
|
|
f725e3 |
- if [ x$isdebug = xdebug ]; then
|
|
|
f725e3 |
- title="$title${GRUB_LINUX_DEBUG_TITLE_POSTFIX}"
|
|
|
f725e3 |
- fi
|
|
|
f725e3 |
if [ x$type != xrecovery ] ; then
|
|
|
f725e3 |
save_default_entry | grub_add_tab
|
|
|
f725e3 |
fi
|