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

args forgot Changelog entry in previous commit

Browse source
This commit is contained in:
fzielcke 2009-03-04 12:44:18 +00:00
parent 2a54b55917
commit 4910684af3
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2009-03-04 Felix Zielcke <fzielcke@z-51.de>
* util/misc.c: Include <time.h>.
(grub_millisleep): New function.
2009-03-04 Bean <bean123ch@gmail.com> 2009-03-04 Bean <bean123ch@gmail.com>
* configure.ac: Only test -mcmodel=large option in x86_64-efi, also add * configure.ac: Only test -mcmodel=large option in x86_64-efi, also add

17
partmap/pc.c
View file

@ -160,9 +160,10 @@ pc_partition_map_iterate (grub_disk_t disk,
{ {
/* Check if the BSD label is within the DOS partition. */ /* Check if the BSD label is within the DOS partition. */
if (p.len <= GRUB_PC_PARTITION_BSD_LABEL_SECTOR) if (p.len <= GRUB_PC_PARTITION_BSD_LABEL_SECTOR)
return grub_error (GRUB_ERR_BAD_PART_TABLE, {
"no space for disk label"); grub_dprintf ("partition", "no space for disk label\n");
continue;
}
/* Read the BSD label. */ /* Read the BSD label. */
if (grub_disk_read (&raw, if (grub_disk_read (&raw,
(p.start (p.start
@ -175,10 +176,12 @@ pc_partition_map_iterate (grub_disk_t disk,
/* Check if it is valid. */ /* Check if it is valid. */
if (label.magic if (label.magic
!= grub_cpu_to_le32 (GRUB_PC_PARTITION_BSD_LABEL_MAGIC)) != grub_cpu_to_le32 (GRUB_PC_PARTITION_BSD_LABEL_MAGIC))
return grub_error (GRUB_ERR_BAD_PART_TABLE, {
"invalid disk label magic 0x%x", grub_dprintf ("partition",
label.magic); "invalid disk label magic 0x%x on partition %d\n",
label.magic, p.index);
continue;
}
for (pcdata.bsd_part = 0; for (pcdata.bsd_part = 0;
pcdata.bsd_part < grub_cpu_to_le16 (label.num_partitions); pcdata.bsd_part < grub_cpu_to_le16 (label.num_partitions);
pcdata.bsd_part++) pcdata.bsd_part++)