From 6a6cbcaf5e0b42bb822a23838e70d2c23398db4e Mon Sep 17 00:00:00 2001
From: fzielcke <fzielcke@localhost>
Date: Tue, 21 Jul 2009 13:37:43 +0000
Subject: [PATCH] 2009-07-21  Felix Zielcke  <fzielcke@z-51.de>

	* util/grub.d/30_os-prober.in: Remove unused CHAINROOT.  Don't
	add drivemap for Vista.  It breaks Windows 7.
---
 ChangeLog                   | 5 +++++
 util/grub.d/30_os-prober.in | 7 +++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 02d5af132..c7502a323 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-21  Felix Zielcke  <fzielcke@z-51.de>
+
+	* util/grub.d/30_os-prober.in: Remove unused CHAINROOT.  Don't
+	add drivemap for Vista.  It breaks Windows 7.
+
 2009-07-21  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* fs/ufs.c (grub_ufs_sblock): Fix offset of mtime2 which was off by
diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
index 552ad8e28..b36c2a366 100644
--- a/util/grub.d/30_os-prober.in
+++ b/util/grub.d/30_os-prober.in
@@ -47,15 +47,18 @@ for OS in ${OSPROBED} ; do
 
   case ${BOOT} in
     chain)
-      CHAINROOT="`grub-probe --target=drive --device ${DEVICE} 2> /dev/null`"
 
       cat << EOF
 menuentry "${LONGNAME} (on ${DEVICE})" {
 EOF
       prepare_grub_to_access_device ${DEVICE} | sed -e "s/^/\t/"
 
-      cat << EOF
+      if [ "${LONGNAME}" != "Windows Vista (loader)" ] ; then
+        cat << EOF
 	drivemap -s (hd0) \${root}
+EOF
+      fi
+      cat <<EOF
 	chainloader +1
 }
 EOF