mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-28 15:46:53 +00:00
db7cf3a089
Add some fixes for BLS parsing logic and also make 20-grub.install script to query the relative path of the kernel and initramfs images, so BLS can also work when /boot is not a mount point or is a btrfs subvolume. Also pull some build fixes. Resolves: rhbz#1588184 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
45 lines
1.3 KiB
Diff
45 lines
1.3 KiB
Diff
From 0994be8d655420685d900a08443b4fd53f639e72 Mon Sep 17 00:00:00 2001
|
|
From: Javier Martinez Canillas <javierm@redhat.com>
|
|
Date: Thu, 10 May 2018 10:52:11 +0200
|
|
Subject: [PATCH 238/243] Add version field to BLS generated by
|
|
grub2-switch-to-blscfg
|
|
|
|
The version field is present in the BLS fragments that are shipped in the
|
|
kernel packages, so add it to the BLS generated by grub2-switch-to-blscfg
|
|
for consistency.
|
|
|
|
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
|
|
---
|
|
util/grub-switch-to-blscfg.in | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/util/grub-switch-to-blscfg.in b/util/grub-switch-to-blscfg.in
|
|
index bc28053cd30..89487ad611c 100644
|
|
--- a/util/grub-switch-to-blscfg.in
|
|
+++ b/util/grub-switch-to-blscfg.in
|
|
@@ -190,12 +190,14 @@ mkbls() {
|
|
local datetime=$1 && shift
|
|
|
|
local debugname=""
|
|
+ local debugid=""
|
|
local flavor=""
|
|
|
|
if [[ "$kernelver" == *\+* ]] ; then
|
|
local flavor=-"${kernelver##*+}"
|
|
if [[ "${flavor}" == "-debug" ]]; then
|
|
local debugname=" with debugging"
|
|
+ local debugid="-debug"
|
|
fi
|
|
fi
|
|
(
|
|
@@ -203,6 +205,7 @@ mkbls() {
|
|
|
|
cat <<EOF
|
|
title ${NAME} (${kernelver}) ${VERSION}${debugname}
|
|
+version ${kernelver}${debugid}
|
|
linux /vmlinuz-${kernelver}
|
|
initrd /initramfs-${kernelver}.img
|
|
options \$kernelopts
|
|
--
|
|
2.17.1
|
|
|