mirror of
https://git.proxmox.com/git/grub2
synced 2025-11-03 14:19:50 +00:00
ce942da8e7
The overflow was in fact impossible in practice because the int parameter is only ever 0, 1, or 2, but GCC couldn't prove that.
38 lines
1.2 KiB
Diff
38 lines
1.2 KiB
Diff
From 00e15161a27958f7f0728c3fb36c0604a5b0aeb9 Mon Sep 17 00:00:00 2001
|
|
From: Mario Limonciello <Mario_Limonciello@dell.com>
|
|
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 <cjwatson@debian.org>
|
|
Author: Harald Sitter <apachelogger@kubuntu.org>
|
|
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 37b5180f3..37c248c54 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
|
|
|