proxmox-mirrors/grub2
1
0
Fork 0
mirror of https://git.proxmox.com/git/grub2 synced 2025-07-27 10:08:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove "GNU/Linux" from default distributor string for Ubuntu.

Browse Source
This commit is contained in:
Colin Watson 2013-01-29 05:50:16 +00:00
parent de99029fea
commit 55f01c0ae1
4 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -9,6 +9,7 @@ grub2 (2.00-13) UNRELEASED; urgency=low
- source_grub2.py: Use attach_default_grub from apport's hookutils. - source_grub2.py: Use attach_default_grub from apport's hookutils.
- Output a menu entry for firmware setup on UEFI FastBoot systems. - Output a menu entry for firmware setup on UEFI FastBoot systems.
- Set a monochromatic theme and an appropriate background for Ubuntu. - Set a monochromatic theme and an appropriate background for Ubuntu.
- Remove "GNU/Linux" from default distributor string for Ubuntu.
-- Colin Watson <cjwatson@debian.org> Mon, 28 Jan 2013 11:08:07 +0000 -- Colin Watson <cjwatson@debian.org> Mon, 28 Jan 2013 11:08:07 +0000

24
debian/patches/mkconfig_ubuntu_distributor.patch vendored Normal file
View File

@ -0,0 +1,24 @@
Description: Remove GNU/Linux from default distributor string for Ubuntu
Ubuntu is called "Ubuntu", not "Ubuntu GNU/Linux".
Author: Mario Limonciello <Mario_Limonciello@dell.com>
Author: Colin Watson <cjwatson@debian.org>
Forwarded: not-needed
Last-Update: 2013-01-29
Index: b/util/grub.d/10_linux.in
===================================================================
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -31,7 +31,11 @@
if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
OS=GNU/Linux
else
- OS="${GRUB_DISTRIBUTOR} GNU/Linux"
+ if [ "${GRUB_DISTRIBUTOR}" = "Ubuntu" ] ; then
+ OS="${GRUB_DISTRIBUTOR}"
+ else
+ OS="${GRUB_DISTRIBUTOR} GNU/Linux"
+ fi
CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}"
fi

1
debian/patches/series vendored
View File

@ -35,3 +35,4 @@ default_grub_d.patch
blacklist_1440x900x32.patch blacklist_1440x900x32.patch
kfreebsd_9.1.patch kfreebsd_9.1.patch
uefi_firmware_setup.patch uefi_firmware_setup.patch
mkconfig_ubuntu_distributor.patch

6
util/grub.d/10_linux.in
View File

@ -31,7 +31,11 @@ CLASS="--class gnu-linux --class gnu --class os"
if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
OS=GNU/Linux OS=GNU/Linux
else else
OS="${GRUB_DISTRIBUTOR} GNU/Linux" if [ "${GRUB_DISTRIBUTOR}" = "Ubuntu" ] ; then
OS="${GRUB_DISTRIBUTOR}"
else
OS="${GRUB_DISTRIBUTOR} GNU/Linux"
fi
CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}" CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}"
fi fi