dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

Blame SOURCES/0118-Don-t-say-GNU-Linux-in-generated-menus.patch

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