* util/grub.d/10_linux.in: Only use the first word of

GRUB_DISTRIBUTOR for --class, to avoid problems if somebody puts
spaces in GRUB_DISTRIBUTOR.
* util/grub.d/10_kfreebsd.in: Likewise.
* util/grub.d/10_hurd.in: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 7441af4b3ef4a86eac47c4ce86afba18ebfe28da..83825a6c35b6ee79dac2bb738f6a938036b9e7b6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-04-08  Colin Watson  <cjwatson@ubuntu.com>
+
+       * util/grub.d/10_linux.in: Only use the first word of
+       GRUB_DISTRIBUTOR for --class, to avoid problems if somebody puts
+       spaces in GRUB_DISTRIBUTOR.
+       * util/grub.d/10_kfreebsd.in: Likewise.
+       * util/grub.d/10_hurd.in: Likewise.
+
 2010-04-06  BVK Chaitanya  <bvk.groups@gmail.com>
 
        Fix unit testing framework for Qemu 0.12.

diff --git a/util/grub.d/10_hurd.in b/util/grub.d/10_hurd.in
index fbb4eb7527b968937107e2468444359fdc748a91..5dbb11f224d7c8c60e482843f6050757d15e8d5e 100644 (file)
--- a/util/grub.d/10_hurd.in
+++ b/util/grub.d/10_hurd.in
@@ -27,7 +27,7 @@ if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
   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

diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in
index dc87d6162c70e8d14a2d5063ae76217244036d07..43651c82bdd43d4c57856a6a343299ee218c2c47 100644 (file)
--- a/util/grub.d/10_kfreebsd.in
+++ b/util/grub.d/10_kfreebsd.in
@@ -30,7 +30,7 @@ CLASS="--class os"
 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"

diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 2c60bc681e247461beaafed6e67a20c519b73600..8dc0df5d9180039802f77e0c57e994d7702f5ca5 100644 (file)
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -31,7 +31,7 @@ if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
   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