You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
85 lines
2.9 KiB
85 lines
2.9 KiB
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
|
From: Peter Jones <pjones@redhat.com> |
|
Date: Mon, 14 Mar 2011 14:27:42 -0400 |
|
Subject: [PATCH] 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 +- |
|
tests/util/grub-shell.in | 2 +- |
|
util/grub.d/10_linux.in | 4 ++-- |
|
util/grub.d/20_linux_xen.in | 4 ++-- |
|
5 files changed, 7 insertions(+), 7 deletions(-) |
|
|
|
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c |
|
index 7ca2e5400b..98372217ad 100644 |
|
--- a/grub-core/normal/main.c |
|
+++ b/grub-core/normal/main.c |
|
@@ -218,7 +218,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 8a87109b15..9a4319d4f4 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/tests/util/grub-shell.in b/tests/util/grub-shell.in |
|
index 93e9f51484..ec1182bf93 100644 |
|
--- a/tests/util/grub-shell.in |
|
+++ b/tests/util/grub-shell.in |
|
@@ -209,7 +209,7 @@ for option in "$@"; do |
|
usage |
|
exit 0 ;; |
|
-v | --version) |
|
- echo "$0 (GNU GRUB ${PACKAGE_VERSION})" |
|
+ echo "$0 (GRUB ${PACKAGE_VERSION})" |
|
exit 0 ;; |
|
--trim) |
|
trim=1 |
|
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in |
|
index dc75a1c30b..4a499c53a6 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 3b1f470492..ada20775a1 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 |
|
|
|
|