From fb08d5d6d2b0d056ce7631c1e259827cfb663972 Mon Sep 17 00:00:00 2001
From: Peter Jones <[email protected]>
Date: Mon, 14 Mar 2011 14:27:42 -0400
Subject: [PATCH 203/272] Don't say "GNU/Linux" in generated menus.

[rharwood: say it even less]
---
 grub-core/normal/main.c         | 2 +-
 tests/util/grub-shell-tester.in | 2 +-
 util/grub.d/10_linux.in         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
index 5b70a9861..1f55b286d 100644
--- a/grub-core/normal/main.c
+++ b/grub-core/normal/main.c
@@ -219,7 +219,7 @@ grub_normal_init_page (struct grub_term_output *term,
 
   grub_term_cls (term);
 
-  msg_formatted = grub_xasprintf (_("GNU GRUB  version %s"), PACKAGE_VERSION);
+  msg_formatted = grub_xasprintf (_("GRUB  version %s"), PACKAGE_VERSION);
   if (!msg_formatted)
     return;
 
diff --git a/tests/util/grub-shell-tester.in b/tests/util/grub-shell-tester.in
index 8a87109b1..9a4319d4f 100644
--- a/tests/util/grub-shell-tester.in
+++ b/tests/util/grub-shell-tester.in
@@ -56,7 +56,7 @@ for option in "$@"; do
 	usage
 	exit 0 ;;
     -v | --version)
-	echo "$0 (GNU GRUB ${PACKAGE_VERSION})"
+	echo "$0 (GRUB ${PACKAGE_VERSION})"
 	exit 0 ;;
     --modules=*)
 	ms=`echo "$option" | sed -e 's/--modules=//'`
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 055389adf..150795116 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -29,7 +29,7 @@ export TEXTDOMAINDIR="@localedir@"
 CLASS="--class gnu-linux --class gnu --class os --unrestricted"
 
 if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
-  OS="$(eval $(grep PRETTY_NAME /etc/os-release) ; echo ${PRETTY_NAME})"
+  OS="$(sed 's, release .*$,,g' /etc/system-release)"
   CLASS="--class $(eval $(grep '^ID_LIKE=\|^ID=' /etc/os-release) ; [ -n "${ID_LIKE}" ] && echo ${ID_LIKE} || echo ${ID}) ${CLASS}"
 else
   OS="${GRUB_DISTRIBUTOR}"
-- 
2.41.0