2008-08-03 Robert Millan <rmh@aybabtu.com>

        * 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).

diff --git a/ChangeLog b/ChangeLog
index d90de0e6fa55d56d8488e768c00128ac79deb691..5989ecb134b1e8ab821f2c19134cbd27155eec48 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-03  Robert Millan  <rmh@aybabtu.com>
+
+       * 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  <rmh@aybabtu.com>
 
        * util/i386/pc/grub-install.in: Remove trailing slash from prefix.

diff --git a/kern/i386/pc/init.c b/kern/i386/pc/init.c
index 6386686bdf1bd330c42e9f85784205db88c32152..0e973eaf46a602789449968eefcd5954d3687319 100644 (file)
--- a/kern/i386/pc/init.c
+++ b/kern/i386/pc/init.c
@@ -64,7 +64,7 @@ make_install_device (void)
   /* 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.  */