X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=just-say-linux.patch;h=d9a62375c26af3e20833fac2ba0b7ae24ed97090;hb=de92e2dd107aa00e09ab6f0f2d41536f16b410b0;hp=6cce32bb0960fb347d3a6b54d53c866f80477be9;hpb=874c4add0aa91b4d5d5a6665790c95d9f8757d81;p=packages%2Fgrub2.git

diff --git a/just-say-linux.patch b/just-say-linux.patch
index 6cce32b..d9a6237 100644
--- a/just-say-linux.patch
+++ b/just-say-linux.patch
@@ -1,18 +1,7 @@
-From d4bd41f972c6e22b86c773cbba2a1e14f400a8be 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.
-
----
- 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 a09c3e6..0b0df78 100644
---- a/util/grub.d/10_linux.in
-+++ b/util/grub.d/10_linux.in
-@@ -29,9 +29,9 @@ export TEXTDOMAINDIR=@localedir@
+diff -ur grub-2.02-beta3.orig/util/grub.d/10_linux.in grub-2.02-beta3/util/grub.d/10_linux.in
+--- grub-2.02-beta3.orig/util/grub.d/10_linux.in	2016-03-21 07:46:19.000000000 +0000
++++ grub-2.02-beta3/util/grub.d/10_linux.in	2016-03-21 07:53:03.762768000 +0000
+@@ -29,9 +29,9 @@
  CLASS="--class gnu-linux --class gnu --class os"
  
  if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
@@ -21,14 +10,13 @@ index a09c3e6..0b0df78 100644
  else
 -  OS="${GRUB_DISTRIBUTOR} GNU/Linux"
 +  OS="${GRUB_DISTRIBUTOR}"
-   CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}"
+   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 ee49cd9..10422b0 100644
---- a/util/grub.d/20_linux_xen.in
-+++ b/util/grub.d/20_linux_xen.in
-@@ -29,9 +29,9 @@ export TEXTDOMAINDIR=@localedir@
+diff -ur grub-2.02-beta3.orig/util/grub.d/20_linux_xen.in grub-2.02-beta3/util/grub.d/20_linux_xen.in
+--- grub-2.02-beta3.orig/util/grub.d/20_linux_xen.in	2016-03-21 07:46:19.000000000 +0000
++++ grub-2.02-beta3/util/grub.d/20_linux_xen.in	2016-03-21 07:53:03.762768000 +0000
+@@ -29,9 +29,9 @@
  CLASS="--class gnu-linux --class gnu --class os --class xen"
  
  if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
@@ -37,9 +25,6 @@ index ee49cd9..10422b0 100644
  else
 -  OS="${GRUB_DISTRIBUTOR} GNU/Linux"
 +  OS="${GRUB_DISTRIBUTOR}"
-   CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}"
+   CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
  fi
  
--- 
-1.7.4
-