[2437] 2009-07-21 Felix Zielcke <address@hidden>

[Felix Zielcke]

Revision: 2437
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2437
Author:   fzielcke
Date:     2009-07-21 13:37:43 +0000 (Tue, 21 Jul 2009)
Log Message:
-----------
2009-07-21  Felix Zielcke  <address@hidden>

        * util/grub.d/30_os-prober.in: Remove unused CHAINROOT.  Don't
        add drivemap for Vista.  It breaks Windows 7.

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

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2009-07-21 12:58:41 UTC (rev 2436)
+++ trunk/grub2/ChangeLog       2009-07-21 13:37:43 UTC (rev 2437)
@@ -1,3 +1,8 @@
+2009-07-21  Felix Zielcke  <address@hidden>
+
+       * 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  <address@hidden>
 
        * fs/ufs.c (grub_ufs_sblock): Fix offset of mtime2 which was off by

Modified: trunk/grub2/util/grub.d/30_os-prober.in
===================================================================
--- trunk/grub2/util/grub.d/30_os-prober.in     2009-07-21 12:58:41 UTC (rev 
2436)
+++ trunk/grub2/util/grub.d/30_os-prober.in     2009-07-21 13:37:43 UTC (rev 
2437)
@@ -47,15 +47,18 @@
 
   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