6b2dd0f
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
f4c76c0
From: Peter Jones <pjones@redhat.com>
f4c76c0
Date: Mon, 14 Mar 2011 14:27:42 -0400
31cddd6
Subject: [PATCH] Don't say "GNU/Linux" in generated menus.
f4c76c0
f4c76c0
---
f4c76c0
 util/grub.d/10_linux.in     | 4 ++--
f4c76c0
 util/grub.d/20_linux_xen.in | 4 ++--
f4c76c0
 2 files changed, 4 insertions(+), 4 deletions(-)
f4c76c0
f4c76c0
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
ad4aff0
index 3a5aa0f8dc9..6299836b5cd 100644
f4c76c0
--- a/util/grub.d/10_linux.in
f4c76c0
+++ b/util/grub.d/10_linux.in
f4c76c0
@@ -29,9 +29,9 @@ export TEXTDOMAINDIR="@localedir@"
f4c76c0
 CLASS="--class gnu-linux --class gnu --class os"
f4c76c0
 
f4c76c0
 if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
f4c76c0
-  OS=GNU/Linux
f4c76c0
+  OS="$(sed 's, release .*$,,g' /etc/system-release)"
f4c76c0
 else
f4c76c0
-  OS="${GRUB_DISTRIBUTOR} GNU/Linux"
f4c76c0
+  OS="${GRUB_DISTRIBUTOR}"
f4c76c0
   CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
f4c76c0
 fi
f4c76c0
 
f4c76c0
diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
752ceb1
index e8143b079dc..972a4b5a03d 100644
f4c76c0
--- a/util/grub.d/20_linux_xen.in
f4c76c0
+++ b/util/grub.d/20_linux_xen.in
f4c76c0
@@ -29,9 +29,9 @@ export TEXTDOMAINDIR="@localedir@"
f4c76c0
 CLASS="--class gnu-linux --class gnu --class os --class xen"
f4c76c0
 
f4c76c0
 if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
f4c76c0
-  OS=GNU/Linux
f4c76c0
+  OS="$(sed 's, release .*$,,g' /etc/system-release)"
f4c76c0
 else
f4c76c0
-  OS="${GRUB_DISTRIBUTOR} GNU/Linux"
f4c76c0
+  OS="${GRUB_DISTRIBUTOR}"
f4c76c0
   CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
f4c76c0
 fi
f4c76c0