[1764] 2008-08-03 Robert Millan <address@hidden>

[Robert Millan]

Revision: 1764
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=1764
Author:   robertmh
Date:     2008-08-02 23:24:34 +0000 (Sat, 02 Aug 2008)

Log Message:
-----------
2008-08-03  Robert Millan  <address@hidden>

        * kern/i386/pc/init.c (make_install_device): Check for `grub_prefix'
        instead of `grub_install_dos_part' to determine whether a drive needs
        to be prepended to prefix (`grub_install_dos_part' is not reliable,
        because it can be overriden when loading GRUB via Multiboot).

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/kern/i386/pc/init.c

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2008-08-02 20:30:19 UTC (rev 1763)
+++ trunk/grub2/ChangeLog       2008-08-02 23:24:34 UTC (rev 1764)
@@ -1,3 +1,10 @@
+2008-08-03  Robert Millan  <address@hidden>
+
+       * kern/i386/pc/init.c (make_install_device): Check for `grub_prefix'
+       instead of `grub_install_dos_part' to determine whether a drive needs
+       to be prepended to prefix (`grub_install_dos_part' is not reliable,
+       because it can be overriden when loading GRUB via Multiboot).
+
 2008-08-02  Robert Millan  <address@hidden>
 
        * util/i386/pc/grub-install.in: Remove trailing slash from prefix.

Modified: trunk/grub2/kern/i386/pc/init.c
===================================================================
--- trunk/grub2/kern/i386/pc/init.c     2008-08-02 20:30:19 UTC (rev 1763)
+++ trunk/grub2/kern/i386/pc/init.c     2008-08-02 23:24:34 UTC (rev 1764)
@@ -64,7 +64,7 @@
   /* XXX: This should be enough.  */
   char dev[100];
 
-  if (grub_install_dos_part != -2)
+  if (grub_prefix[0] != '(')
     {
       /* If the root drive is not set explicitly, assume that it is identical
          to the boot drive.  */