~elementary-os/elementaryos/os-patch-grub2-trusty

« back to all changes in this revision

Viewing changes to debian/patches/mkconfig_ubuntu_distributor.patch

  • Committer: Cody Garver
  • Date: 2014-08-26 02:53:46 UTC
  • Revision ID: cody@elementaryos.org-20140826025346-qhb5s838j01yi6pm
It's just called elementary OS

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
From 9b945075b6407e9cd862cee51eb244cb5f6ead80 Mon Sep 17 00:00:00 2001
2
 
From: Mario Limonciello <Mario_Limonciello@dell.com>
3
 
Date: Mon, 13 Jan 2014 12:13:14 +0000
4
 
Subject: Remove GNU/Linux from default distributor string for Ubuntu
5
 
 
6
 
Ubuntu is called "Ubuntu", not "Ubuntu GNU/Linux".
7
 
 
8
 
Author: Colin Watson <cjwatson@debian.org>
9
 
Author: Harald Sitter <apachelogger@kubuntu.org>
10
 
Forwarded: not-needed
11
 
Last-Update: 2013-12-25
12
 
 
13
 
Patch-Name: mkconfig_ubuntu_distributor.patch
14
 
---
15
 
 util/grub.d/10_linux.in | 9 ++++++++-
16
 
 1 file changed, 8 insertions(+), 1 deletion(-)
17
 
 
18
 
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
19
 
index 5f5c1c9..d343263 100644
20
 
--- a/util/grub.d/10_linux.in
21
 
+++ b/util/grub.d/10_linux.in
22
 
@@ -32,7 +32,14 @@ CLASS="--class gnu-linux --class gnu --class os"
23
 
 if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
24
 
   OS=GNU/Linux
25
 
 else
26
 
-  OS="${GRUB_DISTRIBUTOR} GNU/Linux"
27
 
+  case ${GRUB_DISTRIBUTOR} in
28
 
+    Ubuntu|Kubuntu)
29
 
+      OS="${GRUB_DISTRIBUTOR}"
30
 
+      ;;
31
 
+    *)
32
 
+      OS="${GRUB_DISTRIBUTOR} GNU/Linux"
33
 
+      ;;
34
 
+  esac
35
 
   CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
36
 
 fi
37