nalika / rpms / grub2

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