Package: release.debian.org Severity: normal X-Debbugs-Cc: [email protected] Control: affects -1 + src:grub2 User: [email protected] Usertags: unblock
Please unblock package grub2 [ Reason ] GRUB 2 currently displays a doubled GNU/Linux GNU/Linux in its menu entries. [ Impact ] See above. There's a doubled GRU/Linux displayed in the boot menu. [ Tests ] This has been manually tested by issuing update-grub and checking generated /boot/grub/grub.cfg. [ Risks ] Code change is trivial. [ Checklist ] [X] all changes are documented in the d/changelog [X] I reviewed all changes and I approve them [X] attach debdiff against the package in testing [ Other info ] Kibi already said in #1076723 that we want to have this fixed before trixie release. unblock grub2/2.12-8
diff -Nru grub2-2.12/debian/changelog grub2-2.12/debian/changelog --- grub2-2.12/debian/changelog 2025-03-15 14:55:29.000000000 +0100 +++ grub2-2.12/debian/changelog 2025-06-11 17:42:34.000000000 +0200 @@ -1,3 +1,11 @@ +grub2 (2.12-8) unstable; urgency=medium + + [ Mate Kukri ] + * d/default/grub: Always get distributor string from `/etc/os-release` + * Avoid adding extra GNU/Linux suffix to menu entries (Closes: #1076723) + + -- Felix Zielcke <[email protected]> Wed, 11 Jun 2025 17:42:34 +0200 + grub2 (2.12-7) unstable; urgency=medium [ Mate Kukri ] diff -Nru grub2-2.12/debian/default/grub grub2-2.12/debian/default/grub --- grub2-2.12/debian/default/grub 2025-03-15 14:55:29.000000000 +0100 +++ grub2-2.12/debian/default/grub 2025-06-11 17:42:34.000000000 +0200 @@ -5,7 +5,7 @@ GRUB_DEFAULT=0 GRUB_TIMEOUT=@DEFAULT_TIMEOUT@ -GRUB_DISTRIBUTOR=`( . /etc/os-release; echo ${NAME:-@DPKG_VENDOR@} ) 2>/dev/null || echo @DPKG_VENDOR@` +GRUB_DISTRIBUTOR=`( . /etc/os-release && echo ${NAME} )` GRUB_CMDLINE_LINUX_DEFAULT="@DEFAULT_CMDLINE@" GRUB_CMDLINE_LINUX="" diff -Nru grub2-2.12/debian/patches/gfxpayload-dynamic.patch grub2-2.12/debian/patches/gfxpayload-dynamic.patch --- grub2-2.12/debian/patches/gfxpayload-dynamic.patch 2025-03-15 14:55:29.000000000 +0100 +++ grub2-2.12/debian/patches/gfxpayload-dynamic.patch 2025-06-11 17:42:34.000000000 +0200 @@ -226,7 +226,7 @@ GRUB_FILE_TYPE_LOADENV, GRUB_FILE_TYPE_SAVEENV, diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index aa6c1ac..186c20b 100644 +index 1ee9fd7..e68745a 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -23,6 +23,7 @@ datarootdir="@datarootdir@" diff -Nru grub2-2.12/debian/patches/hwmatch-only-on-grub-pc-platform.patch grub2-2.12/debian/patches/hwmatch-only-on-grub-pc-platform.patch --- grub2-2.12/debian/patches/hwmatch-only-on-grub-pc-platform.patch 2025-03-15 14:55:29.000000000 +0100 +++ grub2-2.12/debian/patches/hwmatch-only-on-grub-pc-platform.patch 2025-06-11 17:42:34.000000000 +0200 @@ -31,7 +31,7 @@ 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index 4adb51d..a29f705 100644 +index 0cea76b..041521c 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -262,7 +262,9 @@ else diff -Nru grub2-2.12/debian/patches/insmod-xzio-and-lzopio-on-xen.patch grub2-2.12/debian/patches/insmod-xzio-and-lzopio-on-xen.patch --- grub2-2.12/debian/patches/insmod-xzio-and-lzopio-on-xen.patch 2025-03-15 14:55:29.000000000 +0100 +++ grub2-2.12/debian/patches/insmod-xzio-and-lzopio-on-xen.patch 2025-06-11 17:42:34.000000000 +0200 @@ -19,7 +19,7 @@ 1 file changed, 1 insertion(+) diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index c4ed052..260e857 100644 +index d1ff1dd..b3cddc3 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -163,6 +163,7 @@ linux_entry () diff -Nru grub2-2.12/debian/patches/maybe-quiet.patch grub2-2.12/debian/patches/maybe-quiet.patch --- grub2-2.12/debian/patches/maybe-quiet.patch 2025-03-15 14:55:29.000000000 +0100 +++ grub2-2.12/debian/patches/maybe-quiet.patch 2025-06-11 17:42:34.000000000 +0200 @@ -339,7 +339,7 @@ if (auto_boot) grub_menu_execute_with_fallback (menu, e, autobooted, diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index b0860b2..887355d 100644 +index b9f22c0..e04a823 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -21,6 +21,7 @@ prefix="@prefix@" diff -Nru grub2-2.12/debian/patches/mkconfig-distributor.patch grub2-2.12/debian/patches/mkconfig-distributor.patch --- grub2-2.12/debian/patches/mkconfig-distributor.patch 1970-01-01 01:00:00.000000000 +0100 +++ grub2-2.12/debian/patches/mkconfig-distributor.patch 2025-06-11 17:42:34.000000000 +0200 @@ -0,0 +1,38 @@ +From: Mario Limonciello <[email protected]> +Date: Mon, 13 Jan 2014 12:13:14 +0000 +Subject: Don't add suffix to the distributor string + +- Ubuntu is called "Ubuntu", not "Ubuntu GNU/Linux" +- Debian already has the suffix in `/etc/os-release` + +Author: Colin Watson <[email protected]> +Author: Harald Sitter <[email protected]> +Author: Mate Kukri <[email protected]> +Forwarded: not-needed +Last-Update: 2024-11-05 + +Patch-Name: mkconfig-distributor.patch +--- + util/grub.d/10_linux.in | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in +index 858052c..b9f22c0 100644 +--- a/util/grub.d/10_linux.in ++++ b/util/grub.d/10_linux.in +@@ -32,7 +32,14 @@ CLASS="--class gnu-linux --class gnu --class os" + if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then + OS=GNU/Linux + else +- OS="${GRUB_DISTRIBUTOR} GNU/Linux" ++ case ${GRUB_DISTRIBUTOR} in ++ Ubuntu|Kubuntu|*GNU/Linux) ++ OS="${GRUB_DISTRIBUTOR}" ++ ;; ++ *) ++ OS="${GRUB_DISTRIBUTOR} GNU/Linux" ++ ;; ++ esac + CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}" + fi + diff -Nru grub2-2.12/debian/patches/mkconfig-recovery-title.patch grub2-2.12/debian/patches/mkconfig-recovery-title.patch --- grub2-2.12/debian/patches/mkconfig-recovery-title.patch 2025-03-15 14:55:29.000000000 +0100 +++ grub2-2.12/debian/patches/mkconfig-recovery-title.patch 2025-06-11 17:42:34.000000000 +0200 @@ -89,7 +89,7 @@ title="$(gettext_printf "%s, with kFreeBSD %s" "${os}" "${version}")" fi diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index ed5748a..c4ed052 100644 +index 1047cde..d1ff1dd 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -127,7 +127,7 @@ linux_entry () diff -Nru grub2-2.12/debian/patches/mkconfig-ubuntu-distributor.patch grub2-2.12/debian/patches/mkconfig-ubuntu-distributor.patch --- grub2-2.12/debian/patches/mkconfig-ubuntu-distributor.patch 2025-03-15 14:55:29.000000000 +0100 +++ grub2-2.12/debian/patches/mkconfig-ubuntu-distributor.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,36 +0,0 @@ -From: Mario Limonciello <[email protected]> -Date: Mon, 13 Jan 2014 12:13:14 +0000 -Subject: Remove GNU/Linux from default distributor string for Ubuntu - -Ubuntu is called "Ubuntu", not "Ubuntu GNU/Linux". - -Author: Colin Watson <[email protected]> -Author: Harald Sitter <[email protected]> -Forwarded: not-needed -Last-Update: 2013-12-25 - -Patch-Name: mkconfig-ubuntu-distributor.patch ---- - util/grub.d/10_linux.in | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index 858052c..b0860b2 100644 ---- a/util/grub.d/10_linux.in -+++ b/util/grub.d/10_linux.in -@@ -32,7 +32,14 @@ CLASS="--class gnu-linux --class gnu --class os" - if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then - OS=GNU/Linux - else -- OS="${GRUB_DISTRIBUTOR} GNU/Linux" -+ case ${GRUB_DISTRIBUTOR} in -+ Ubuntu|Kubuntu) -+ OS="${GRUB_DISTRIBUTOR}" -+ ;; -+ *) -+ OS="${GRUB_DISTRIBUTOR} GNU/Linux" -+ ;; -+ esac - CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}" - fi - diff -Nru grub2-2.12/debian/patches/quick-boot.patch grub2-2.12/debian/patches/quick-boot.patch --- grub2-2.12/debian/patches/quick-boot.patch 2025-03-15 14:55:29.000000000 +0100 +++ grub2-2.12/debian/patches/quick-boot.patch 2025-06-11 17:42:34.000000000 +0200 @@ -257,7 +257,7 @@ EOF } diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index 887355d..aa6c1ac 100644 +index e04a823..1ee9fd7 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -22,6 +22,7 @@ exec_prefix="@exec_prefix@" diff -Nru grub2-2.12/debian/patches/recovery-dis_ucode_ldr.patch grub2-2.12/debian/patches/recovery-dis_ucode_ldr.patch --- grub2-2.12/debian/patches/recovery-dis_ucode_ldr.patch 2025-03-15 14:55:29.000000000 +0100 +++ grub2-2.12/debian/patches/recovery-dis_ucode_ldr.patch 2025-06-11 17:42:34.000000000 +0200 @@ -16,7 +16,7 @@ 1 file changed, 4 insertions(+) diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index 260e857..4adb51d 100644 +index b3cddc3..0cea76b 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -228,6 +228,10 @@ case "$machine" in diff -Nru grub2-2.12/debian/patches/series grub2-2.12/debian/patches/series --- grub2-2.12/debian/patches/series 2025-03-15 14:55:29.000000000 +0100 +++ grub2-2.12/debian/patches/series 2025-06-11 17:42:34.000000000 +0200 @@ -13,7 +13,7 @@ mkconfig-nonexistent-loopback.patch default-grub-d.patch blacklist-1440x900x32.patch -mkconfig-ubuntu-distributor.patch +mkconfig-distributor.patch maybe-quiet.patch install-efi-adjust-distributor.patch quick-boot.patch diff -Nru grub2-2.12/debian/patches/vt-handoff.patch grub2-2.12/debian/patches/vt-handoff.patch --- grub2-2.12/debian/patches/vt-handoff.patch 2025-03-15 14:55:29.000000000 +0100 +++ grub2-2.12/debian/patches/vt-handoff.patch 2025-06-11 17:42:34.000000000 +0200 @@ -39,7 +39,7 @@ AC_SUBST([FONT_SOURCE]) diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index 186c20b..ed5748a 100644 +index e68745a..1047cde 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -24,6 +24,7 @@ ubuntu_recovery="@UBUNTU_RECOVERY@"
