9a4054fb1c
Resolves: rhbz#1344700 - Make chainloader code work right when shim is absent or disabled Resolves: rhbz#1344512 Signed-off-by: Peter Jones <pjones@redhat.com>
46 lines
1.5 KiB
Diff
46 lines
1.5 KiB
Diff
From d110064c73c1604b07cdaa3d41751074b2701142 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Mon, 14 Mar 2011 14:27:42 -0400
|
|
Subject: [PATCH 39/83] Don't say "GNU/Linux" in generated menus.
|
|
|
|
---
|
|
util/grub.d/10_linux.in | 4 ++--
|
|
util/grub.d/20_linux_xen.in | 4 ++--
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
|
|
index f3bf6ac..ef52cf3 100644
|
|
--- a/util/grub.d/10_linux.in
|
|
+++ b/util/grub.d/10_linux.in
|
|
@@ -29,9 +29,9 @@ export TEXTDOMAINDIR="@localedir@"
|
|
CLASS="--class gnu-linux --class gnu --class os"
|
|
|
|
if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
|
|
- OS=GNU/Linux
|
|
+ OS="$(sed 's, release .*$,,g' /etc/system-release)"
|
|
else
|
|
- OS="${GRUB_DISTRIBUTOR} GNU/Linux"
|
|
+ OS="${GRUB_DISTRIBUTOR}"
|
|
CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
|
|
fi
|
|
|
|
diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
|
|
index c48af94..25e3c41 100644
|
|
--- a/util/grub.d/20_linux_xen.in
|
|
+++ b/util/grub.d/20_linux_xen.in
|
|
@@ -29,9 +29,9 @@ export TEXTDOMAINDIR="@localedir@"
|
|
CLASS="--class gnu-linux --class gnu --class os --class xen"
|
|
|
|
if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
|
|
- OS=GNU/Linux
|
|
+ OS="$(sed 's, release .*$,,g' /etc/system-release)"
|
|
else
|
|
- OS="${GRUB_DISTRIBUTOR} GNU/Linux"
|
|
+ OS="${GRUB_DISTRIBUTOR}"
|
|
CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
|
|
fi
|
|
|
|
--
|
|
2.7.4
|
|
|