nalika / rpms / grub2

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