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

2008-02-16 Robert Millan <rmh@aybabtu.com>

Browse source 
* util/i386/pc/grub-setup.c (setup): In find_first_partition_start(),
        do not assume partition map is PC/MSDOS before performing checks that
        are specific to that layout.
This commit is contained in:
robertmh 2008-02-16 22:31:35 +00:00
parent 0de8be863b
commit aca6350297
2 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2008-02-16 Robert Millan <rmh@aybabtu.com>
* util/i386/pc/grub-setup.c (setup): In find_first_partition_start(),
do not assume partition map is PC/MSDOS before performing checks that
are specific to that layout.
2008-02-13 Robert Millan <rmh@aybabtu.com>
* conf/i386-linuxbios.rmk (grub_emu_SOURCES): Remove

20
util/i386/pc/grub-setup.c
View file

@ -120,13 +120,21 @@ setup (const char *prefix, const char *dir,
int find_first_partition_start (grub_disk_t disk __attribute__ ((unused)),
const grub_partition_t p)
{
struct grub_pc_partition *pcdata = p->data;
if (! strcmp (p->partmap->name, "pc_partition_map"))
{
struct grub_pc_partition *pcdata = p->data;
if (! grub_pc_partition_is_empty (pcdata->dos_type)
&& ! grub_pc_partition_is_bsd (pcdata->dos_type)
&& first_start > p->start)
first_start = p->start;
}
else
{
if (first_start > p->start)
first_start = p->start;
}
if (! grub_pc_partition_is_empty (pcdata->dos_type)
&& ! grub_pc_partition_is_bsd (pcdata->dos_type)
&& first_start > p->start)
first_start = p->start;
return 0;
}