[2014] args forgot Changelog entry in previous commit

Revision: 2014
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2014
Author:   fzielcke
Date:     2009-03-04 12:44:18 +0000 (Wed, 04 Mar 2009)
Log Message:
-----------
args forgot Changelog entry in previous commit

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/partmap/pc.c

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog	2009-03-04 10:25:31 UTC (rev 2013)
+++ trunk/grub2/ChangeLog	2009-03-04 12:44:18 UTC (rev 2014)
@@ -1,3 +1,8 @@
+2009-03-04  Felix Zielcke  <[email protected]>
+
+	* util/misc.c: Include <time.h>.
+	(grub_millisleep): New function.
+
 2009-03-04  Bean  <[email protected]>
 
 	* configure.ac: Only test -mcmodel=large option in x86_64-efi, also add

Modified: trunk/grub2/partmap/pc.c
===================================================================
--- trunk/grub2/partmap/pc.c	2009-03-04 10:25:31 UTC (rev 2013)
+++ trunk/grub2/partmap/pc.c	2009-03-04 12:44:18 UTC (rev 2014)
@@ -160,9 +160,10 @@
 		{
 		  /* 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 @@
 		  /* 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++)