From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 6 Mar 2011 21:14:21 +0000 (+0100)
Subject: grub: Fix for spaces in --class parameter.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dcc3c9bd46292cfbd066d37a5b174751258e314a;p=ipfire-3.x.git

grub: Fix for spaces in --class parameter.

This caused a crash in the menu.
---

diff --git a/pkgs/grub/grub.nm b/pkgs/grub/grub.nm
index ecb359027..f390c2585 100644
--- a/pkgs/grub/grub.nm
+++ b/pkgs/grub/grub.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
 
 PKG_NAME       = grub
 PKG_VER        = 1.98
-PKG_REL        = 5
+PKG_REL        = 6
 
 PKG_MAINTAINER =
 PKG_GROUP      = System/Boot
diff --git a/pkgs/grub/patches/grub-1.98-GRUB_DISTRIBUTOR-spaces-fix-1.patch0 b/pkgs/grub/patches/grub-1.98-GRUB_DISTRIBUTOR-spaces-fix-1.patch0
new file mode 100644
index 000000000..d3d072793
--- /dev/null
+++ b/pkgs/grub/patches/grub-1.98-GRUB_DISTRIBUTOR-spaces-fix-1.patch0
@@ -0,0 +1,39 @@
+=== modified file 'util/grub.d/10_hurd.in'
+--- util/grub.d/10_hurd.in	2010-02-03 00:24:07 +0000
++++ util/grub.d/10_hurd.in	2010-04-08 09:54:44 +0000
+@@ -27,7 +27,7 @@
+   OS=GNU
+ else
+   OS="${GRUB_DISTRIBUTOR} GNU/Hurd"
+-  CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]') ${CLASS}"
++  CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]' | cut -d' ' -f1) ${CLASS}"
+ fi
+ 
+ at_least_one=false
+
+=== modified file 'util/grub.d/10_kfreebsd.in'
+--- util/grub.d/10_kfreebsd.in	2010-02-03 00:24:07 +0000
++++ util/grub.d/10_kfreebsd.in	2010-04-08 09:54:44 +0000
+@@ -30,7 +30,7 @@
+ case "${GRUB_DISTRIBUTOR}" in
+   Debian)
+ 	OS="${GRUB_DISTRIBUTOR} GNU/kFreeBSD"
+-	CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]') --class gnu-kfreebsd --class gnu ${CLASS}"
++	CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]' | cut -d' ' -f1) --class gnu-kfreebsd --class gnu ${CLASS}"
+   ;;
+   *)
+ 	OS="FreeBSD"
+
+=== modified file 'util/grub.d/10_linux.in'
+--- util/grub.d/10_linux.in	2010-02-26 13:32:24 +0000
++++ util/grub.d/10_linux.in	2010-04-08 09:54:44 +0000
+@@ -31,7 +31,7 @@
+   OS=GNU/Linux
+ else
+   OS="${GRUB_DISTRIBUTOR} GNU/Linux"
+-  CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]') ${CLASS}"
++  CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]' | cut -d' ' -f1) ${CLASS}"
+ fi
+ 
+ # loop-AES arranges things so that /dev/loop/X can be our root device, but
+