From 55f01c0ae13b04d92a8f7f82fb475c963c752e7a Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@canonical.com>
Date: Tue, 29 Jan 2013 05:50:16 +0000
Subject: [PATCH] Remove "GNU/Linux" from default distributor string for
 Ubuntu.

---
 debian/changelog                              |  1 +
 .../patches/mkconfig_ubuntu_distributor.patch | 24 +++++++++++++++++++
 debian/patches/series                         |  1 +
 util/grub.d/10_linux.in                       |  6 ++++-
 4 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 debian/patches/mkconfig_ubuntu_distributor.patch

diff --git a/debian/changelog b/debian/changelog
index f0cb6cfa9..7587b1e20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ grub2 (2.00-13) UNRELEASED; urgency=low
     - source_grub2.py: Use attach_default_grub from apport's hookutils.
     - Output a menu entry for firmware setup on UEFI FastBoot systems.
     - 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
 
diff --git a/debian/patches/mkconfig_ubuntu_distributor.patch b/debian/patches/mkconfig_ubuntu_distributor.patch
new file mode 100644
index 000000000..a48aa4dc3
--- /dev/null
+++ b/debian/patches/mkconfig_ubuntu_distributor.patch
@@ -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
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 10fc33341..c09f6c90f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -35,3 +35,4 @@ default_grub_d.patch
 blacklist_1440x900x32.patch
 kfreebsd_9.1.patch
 uefi_firmware_setup.patch
+mkconfig_ubuntu_distributor.patch
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 380ea3f63..2f83e01e0 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -31,7 +31,11 @@ CLASS="--class gnu-linux --class gnu --class os"
 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