2009-09-14 Colin Watson <cjwatson@ubuntu.com>

	* util/grub.d/30_os-prober.in: Cope with Windows 7 in os-prober
	output.

diff --git a/ChangeLog b/ChangeLog
index 0ab86b8f8c1a541cefdb6955b30b42209da132b9..69b65bf67568321ed1bbc71532508ae89eb92adb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-14  Colin Watson  <cjwatson@ubuntu.com>
+
+       * util/grub.d/30_os-prober.in: Cope with Windows 7 in os-prober
+       output.
+
 2009-09-13  Robert Millan  <rmh.grub@aybabtu.com>
 
        * configure.ac: Remove --enable-grub-pe2elf.  Only build

diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
index ffc46c9d4e316d7aecd8287f6fe0da36bcfa46e7..4a1648881e51e8260b27a50e427e9c7d7e43e116 100644 (file)
--- a/util/grub.d/30_os-prober.in
+++ b/util/grub.d/30_os-prober.in
@@ -57,11 +57,16 @@ menuentry "${LONGNAME} (on ${DEVICE})" {
 EOF
       prepare_grub_to_access_device ${DEVICE} | sed -e "s/^/\t/"
 
-      if [ "${LONGNAME}" != "Windows Vista (loader)" ] ; then
-        cat << EOF
+      case ${LONGNAME} in
+       Windows\ Vista*|Windows\ 7*)
+       ;;
+       *)
+         cat << EOF
        drivemap -s (hd0) \${root}
 EOF
-      fi
+       ;;
+      esac
+
       cat <<EOF
        chainloader +1
 }