From 2d52f57f1035397ed183e7c6a488e0e26e6e5a86 Mon Sep 17 00:00:00 2001 From: robertmh Date: Sat, 2 Aug 2008 23:24:34 +0000 Subject: [PATCH] 2008-08-03 Robert Millan * 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). --- ChangeLog | 7 +++++++ kern/i386/pc/init.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d90de0e6f..5989ecb13 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-08-03 Robert Millan + + * 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 * 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 6386686bd..0e973eaf4 100644 --- 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. */