From 2ab42d88bf8be7da7ef8918d1f8a5275725c7ec3 Mon Sep 17 00:00:00 2001 From: Felix Zielcke Date: Wed, 4 Mar 2009 12:44:18 +0000 Subject: [PATCH] args forgot Changelog entry in previous commit git-svn-id: svn://svn.savannah.gnu.org/grub/trunk/grub2@2014 d0de0278-0dc1-4c01-8a07-af38b3205e46 --- ChangeLog | 5 +++++ partmap/pc.c | 17 ++++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4968e0d3..f0f26e1f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-03-04 Felix Zielcke + + * util/misc.c: Include . + (grub_millisleep): New function. + 2009-03-04 Bean * configure.ac: Only test -mcmodel=large option in x86_64-efi, also add diff --git a/partmap/pc.c b/partmap/pc.c index 419775a2..d7e1da16 100644 --- a/partmap/pc.c +++ b/partmap/pc.c @@ -160,9 +160,10 @@ pc_partition_map_iterate (grub_disk_t disk, { /* Check if the BSD label is within the DOS partition. */ 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. */ if (grub_disk_read (&raw, (p.start @@ -175,10 +176,12 @@ pc_partition_map_iterate (grub_disk_t disk, /* Check if it is valid. */ if (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", - label.magic); - + { + grub_dprintf ("partition", + "invalid disk label magic 0x%x on partition %d\n", + label.magic, p.index); + continue; + } for (pcdata.bsd_part = 0; pcdata.bsd_part < grub_cpu_to_le16 (label.num_partitions); pcdata.bsd_part++) -- 2.11.4.GIT