args forgot Changelog entry in previous commit

diff --git a/ChangeLog b/ChangeLog
index 4968e0d3ceaa85f62d6788e55643e5af3f3748ea..f0f26e1f2c88971bde6d8799343adb37aae319db 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * configure.ac: Only test -mcmodel=large option in x86_64-efi, also add

diff --git a/partmap/pc.c b/partmap/pc.c
index 419775a21a9077f733682827819b4ffd260f12ed..d7e1da162e12cf7f238c9d4a49b04641947200fd 100644 (file)
--- 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++)