dcavalca / rpms / grub2

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