|
 |
c789522 |
From 7a7644507e4d953ea8f8d1d7133622a72a2168f5 Mon Sep 17 00:00:00 2001
|
|
|
bc092b9 |
From: Peter Jones <pjones@redhat.com>
|
|
|
bc092b9 |
Date: Tue, 28 Apr 2015 11:15:03 -0400
|
|
|
31cddd6 |
Subject: [PATCH] Make grub2-mkconfig construct titles that look like
|
|
|
bc092b9 |
the ones we want elsewhere.
|
|
|
bc092b9 |
|
|
|
bc092b9 |
Resolves: rhbz#1215839
|
|
|
bc092b9 |
|
|
|
bc092b9 |
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
|
bc092b9 |
---
|
|
|
ec4acbb |
util/grub.d/10_linux.in | 32 ++++++++++++++++++++++----------
|
|
|
ec4acbb |
1 file changed, 22 insertions(+), 10 deletions(-)
|
|
|
bc092b9 |
|
|
|
bc092b9 |
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
|
|
|
ec4acbb |
index 1215241859b..584ad1f4639 100644
|
|
|
bc092b9 |
--- a/util/grub.d/10_linux.in
|
|
|
bc092b9 |
+++ b/util/grub.d/10_linux.in
|
|
|
6f1e3d5 |
@@ -70,11 +70,28 @@ esac
|
|
|
bc092b9 |
|
|
|
6f1e3d5 |
mktitle ()
|
|
|
6f1e3d5 |
{
|
|
|
6f1e3d5 |
- local OS_NAME="$(eval $(grep ^NAME= /etc/os-release) ; echo ${NAME})"
|
|
|
6f1e3d5 |
- local OS_VERS="$(eval $(grep ^VERSION= /etc/os-release) ; echo ${VERSION})"
|
|
|
bc092b9 |
+ local title_type
|
|
|
bc092b9 |
+ local version
|
|
|
bc092b9 |
+ local OS_NAME
|
|
|
bc092b9 |
+ local OS_VERS
|
|
|
ec4acbb |
|
|
|
ec4acbb |
- local titlestr="${OS_NAME} (%s) ${OS_VERS}"
|
|
|
ec4acbb |
- echo -n ${titlestr}
|
|
|
bc092b9 |
+ title_type=$1 && shift
|
|
|
bc092b9 |
+ version=$1 && shift
|
|
|
bc092b9 |
+
|
|
|
bc092b9 |
+ OS_NAME="$(eval $(grep ^NAME= /etc/os-release) ; echo ${NAME})"
|
|
|
bc092b9 |
+ OS_VERS="$(eval $(grep ^VERSION= /etc/os-release) ; echo ${VERSION})"
|
|
|
bc092b9 |
+
|
|
|
bc092b9 |
+ case $title_type in
|
|
|
bc092b9 |
+ recovery)
|
|
|
bc092b9 |
+ title=$(printf '%s (%s) %s (recovery mode)' \
|
|
|
bc092b9 |
+ "${OS_NAME}" "${version}" "${OS_VERS}")
|
|
|
bc092b9 |
+ ;;
|
|
|
bc092b9 |
+ *)
|
|
|
bc092b9 |
+ title=$(printf '%s (%s) %s' \
|
|
|
bc092b9 |
+ "${OS_NAME}" "${version}" "${OS_VERS}")
|
|
|
bc092b9 |
+ ;;
|
|
|
bc092b9 |
+ esac
|
|
|
bc092b9 |
+ echo -n ${title}
|
|
|
6f1e3d5 |
}
|
|
|
da63b36 |
|
|
|
6f1e3d5 |
title_correction_code=
|
|
|
6f1e3d5 |
@@ -105,12 +122,7 @@ linux_entry ()
|
|
|
bc092b9 |
boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
|
|
|
bc092b9 |
fi
|
|
|
bc092b9 |
if [ x$type != xsimple ] ; then
|
|
|
bc092b9 |
- case $type in
|
|
|
bc092b9 |
- recovery)
|
|
|
6f1e3d5 |
- title="$(printf "$(mktitle) (recovery mode)" "${version}")" ;;
|
|
|
bc092b9 |
- *)
|
|
|
6f1e3d5 |
- title="$(printf "$(mktitle)" "${version}")" ;;
|
|
|
bc092b9 |
- esac
|
|
|
bc092b9 |
+ title=$(mktitle "$type" "$version")
|
|
|
bc092b9 |
if [ x"$title" = x"$GRUB_ACTUAL_DEFAULT" ] || [ x"Previous Linux versions>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then
|
|
|
bc092b9 |
replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')"
|
|
|
bc092b9 |
quoted="$(echo "$GRUB_ACTUAL_DEFAULT" | grub_quote)"
|