[2594] 2009-09-14 Colin Watson <[email protected]>

Revision: 2594
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2594
Author:   cjwatson
Date:     2009-09-14 11:32:00 +0000 (Mon, 14 Sep 2009)
Log Message:
-----------
2009-09-14  Colin Watson  <[email protected]>

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

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/util/grub.d/30_os-prober.in

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog	2009-09-13 01:30:18 UTC (rev 2593)
+++ trunk/grub2/ChangeLog	2009-09-14 11:32:00 UTC (rev 2594)
@@ -1,3 +1,8 @@
+2009-09-14  Colin Watson  <[email protected]>
+
+	* util/grub.d/30_os-prober.in: Cope with Windows 7 in os-prober
+	output.
+
 2009-09-13  Robert Millan  <[email protected]>
 
 	* configure.ac: Remove --enable-grub-pe2elf.  Only build

Modified: trunk/grub2/util/grub.d/30_os-prober.in
===================================================================
--- trunk/grub2/util/grub.d/30_os-prober.in	2009-09-13 01:30:18 UTC (rev 2593)
+++ trunk/grub2/util/grub.d/30_os-prober.in	2009-09-14 11:32:00 UTC (rev 2594)
@@ -57,11 +57,16 @@
 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
 }