horok/grub2
1
0
Fork 0
Code Activity

Replacing appending Linux references with kernel in boot menu.

Browse source 
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
This commit is contained in:
Daniel Baumann 2025-06-23 13:43:56 +02:00
parent bf916c08a6
commit 253e86d523
Signed by: daniel.baumann
GPG key ID: BCC918A2ABD66424
2 changed files with 55 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

54
debian/patches/progress-linux/0002-kernel.patch vendored Normal file
View file

@ -0,0 +1,54 @@
Author: Daniel Baumann <daniel.baumann@progress-linux.org>
Description: Replacing appending Linux references with kernel in boot menu.
diff -Naurp grub2.orig/util/grub.d/10_linux.in grub2/util/grub.d/10_linux.in
--- grub2.orig/util/grub.d/10_linux.in
+++ grub2/util/grub.d/10_linux.in
@@ -120,11 +120,11 @@ linux_entry ()
if [ x$type != xsimple ] ; then
case $type in
recovery)
- title="$(gettext_printf "%s, with Linux %s (%s)" "${os}" "${version}" "$(gettext "${GRUB_RECOVERY_TITLE}")")" ;;
+ title="$(gettext_printf "%s, with kernel %s (%s)" "${os}" "${version}" "$(gettext "${GRUB_RECOVERY_TITLE}")")" ;;
*)
- title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;;
+ title="$(gettext_printf "%s, with kernel %s" "${os}" "${version}")" ;;
esac
- if [ x"$title" = x"$GRUB_ACTUAL_DEFAULT" ] || [ x"Previous Linux versions>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then
+ if [ x"$title" = x"$GRUB_ACTUAL_DEFAULT" ] || [ x"Previous kernel versions>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then
replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')"
quoted="$(echo "$GRUB_ACTUAL_DEFAULT" | grub_quote)"
title_correction_code="${title_correction_code}if [ \"x\$default\" = '$quoted' ]; then default='$(echo "$replacement_title" | grub_quote)'; fi;"
@@ -170,7 +170,7 @@ linux_entry ()
printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
fi
if [ x"$quiet_boot" = x0 ] || [ x"$type" != xsimple ]; then
- message="$(gettext_printf "Loading Linux %s ..." ${version})"
+ message="$(gettext_printf "Loading kernel image %s ..." ${version})"
sed "s/^/$submenu_indentation/" << EOF
echo '$(echo "$message" | grub_quote)'
EOF
diff -Naurp grub2.orig/util/grub.d/20_linux_xen.in grub2/util/grub.d/20_linux_xen.in
--- grub2.orig/util/grub.d/20_linux_xen.in
+++ grub2/util/grub.d/20_linux_xen.in
@@ -125,9 +125,9 @@ linux_entry_xsm ()
fi
if [ x$type != xsimple ] ; then
if [ x$type = xrecovery ] ; then
- title="$(gettext_printf "%s, with Xen %s and Linux %s (%s)" "${os}" "${entry_xen_version}" "${version}" "$(gettext "${GRUB_RECOVERY_TITLE}")")"
+ title="$(gettext_printf "%s, with Xen %s and kernel %s (%s)" "${os}" "${entry_xen_version}" "${version}" "$(gettext "${GRUB_RECOVERY_TITLE}")")"
else
- title="$(gettext_printf "%s, with Xen %s and Linux %s" "${os}" "${entry_xen_version}" "${version}")"
+ title="$(gettext_printf "%s, with Xen %s and kernel %s" "${os}" "${entry_xen_version}" "${version}")"
fi
replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')"
if [ x"Xen ${entry_xen_version}>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then
@@ -149,7 +149,7 @@ linux_entry_xsm ()
fi
printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
xmessage="$(gettext_printf "Loading Xen %s ..." ${entry_xen_version})"
- lmessage="$(gettext_printf "Loading Linux %s ..." ${version})"
+ lmessage="$(gettext_printf "Loading kernel image %s ..." ${version})"
sed "s/^/$submenu_indentation/" << EOF
echo '$(echo "$xmessage" | grub_quote)'
if [ "\$grub_platform" = "pc" -o "\$grub_platform" = "" ]; then

1
debian/patches/series vendored
View file

@ -145,3 +145,4 @@ cve-2025-jan/fs-xfs-Fix-grub_xfs_iterate_dir-return-value-in-case-of-f.patch
cve-2025-jan/fs-xfs-Propagate-incorrect-inode-error-from-grub_xfs_read.patch
cve-2025-jan/fs-xfs-Handle-root-inode-read-failure-in-grub_xfs_mount.patch
progress-linux/0001-distributor.patch
progress-linux/0002-kernel.patch