vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2008-06-15 Robert Millan <rmh@aybabtu.com>

Browse source 
* util/i386/pc/grub-mkimage.c (generate_image): If we included a drive
        in our prefix, set install_{dos,bsd}_part = -2 to indicate this can be
        skipped later.
        (main): If a memdisk was requested, add "(memdisk)" drive explicitly to
        the beginning of the prefix.

        * kern/i386/pc/init.c (make_install_device): Remove memdisk check.
        It is assumed that if we have a memdisk, grub-mkimage has set
        grub_prefix to include the "(memdisk)" drive in it.
This commit is contained in:
robertmh 2008-06-15 18:21:16 +00:00
parent a7cbd45a07
commit a920728493
3 changed files with 28 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
kern/i386/pc/init.c
View file

@ -64,12 +64,7 @@ make_install_device (void)
/* XXX: This should be enough. */
char dev[100];
if (grub_memdisk_image_size)
{
grub_sprintf (dev, "(memdisk)%s", grub_prefix);
grub_strcpy (grub_prefix, dev);
}
else if (grub_install_dos_part != -2)
if (grub_install_dos_part != -2)
{
/* If the root drive is not set explicitly, assume that it is identical
to the boot drive. */