Replacing appending of 'with Linux' with 'with kernel' in boot menu.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 61 insertions, 0 deletions

diff --git a/debian/patches/progress-linux/0002-kernel.patch b/debian/patches/progress-linux/0002-kernel.patch
new file mode 100644
index 0000000..4db0b03
--- /dev/null
+++ b/debian/patches/progress-linux/0002-kernel.patch
@@ -0,0 +1,60 @@
+Author: Daniel Baumann <daniel.baumann@progress-linux.org>
+Description: Replacing appending of 'with Linux' with '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
+@@ -108,13 +108,13 @@ 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}")")" ;;
+ 	  init-*)
+-	      title="$(gettext_printf "%s, with Linux %s (%s)" "${os}" "${version}" "${type#init-}")" ;;
++	      title="$(gettext_printf "%s, with kernel %s (%s)" "${os}" "${version}" "${type#init-}")" ;;
+ 	  *)
+-	      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;"
+@@ -160,7 +160,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 %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
+@@ -94,11 +94,11 @@ linux_entry ()
+   fi
+   if [ x$type != xsimple ] ; then
+       if [ x$type = xrecovery ] ; then
+-	  title="$(gettext_printf "%s, with Xen %s and Linux %s (%s)" "${os}" "${xen_version}" "${version}" "$(gettext "${GRUB_RECOVERY_TITLE}")")"
++	  title="$(gettext_printf "%s, with Xen %s and kernel %s (%s)" "${os}" "${xen_version}" "${version}" "$(gettext "${GRUB_RECOVERY_TITLE}")")"
+       elif [ "${type#init-}" != "$type" ] ; then
+-	  title="$(gettext_printf "%s, with Xen %s and Linux %s (%s)" "${os}" "${xen_version}" "${version}" "${type#init-}")"
++	  title="$(gettext_printf "%s, with Xen %s and kernel %s (%s)" "${os}" "${xen_version}" "${version}" "${type#init-}")"
+       else
+-	  title="$(gettext_printf "%s, with Xen %s and Linux %s" "${os}" "${xen_version}" "${version}")"
++	  title="$(gettext_printf "%s, with Xen %s and kernel %s" "${os}" "${xen_version}" "${version}")"
+       fi
+       replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')"
+       if [ x"Xen ${xen_version}>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then
+@@ -120,7 +120,7 @@ linux_entry ()
+   fi
+   printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
+   xmessage="$(gettext_printf "Loading Xen %s ..." ${xen_version})"
+-  lmessage="$(gettext_printf "Loading Linux %s ..." ${version})"
++  lmessage="$(gettext_printf "Loading kernel %s ..." ${version})"
+   sed "s/^/$submenu_indentation/" << EOF
+ 	echo	'$(echo "$xmessage" | grub_quote)'
+         if [ "\$grub_platform" = "pc" -o "\$grub_platform" = "" ]; then
diff --git a/debian/patches/series b/debian/patches/series
index cd7ebd9..64c655a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -114,3 +114,4 @@ ntfs-cve-fixes/fs-ntfs-Fix-an-OOB-read-when-parsing-bitmaps-for-index-at.patch
 ntfs-cve-fixes/fs-ntfs-Fix-an-OOB-read-when-parsing-a-volume-label.patch
 ntfs-cve-fixes/fs-ntfs-Make-code-more-readable.patch
 progress-linux/0001-grub-distributor.patch
+progress-linux/0002-kernel.patch