Am Dienstag, den 05.08.2008, 15:10 +0200 schrieb Marco Gerards:
> Felix Zielcke <[EMAIL PROTECTED]> writes:
>
> > 2008-08-05 Felix Zielcke <[EMAIL PROTECTED]>
> >
> > * partmap/pc.c (pc_partition_map_iterate): Do not abort on an invalid
> > BSD
> > magic or if there's no space left, use grub_dprintf to issue a warning.
>
> Looks fine.
Hurray.
> > + {
> > + grub_dprintf ("partition",
> > + "invalid disk label magic 0x%x on partition
> > %d\n"
> > + label.magic, p.index);
> > + continue;
> > + }
>
> Isn't a comma missing after the second string? I am surprised that
> this compiles. Or am I missing something?
>
You're right, shame on me I notice to missing spaces but not a missing
comma.
Attached.
Index: partmap/pc.c
===================================================================
--- partmap/pc.c (Revision 1770)
+++ partmap/pc.c (Arbeitskopie)
@@ -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++)
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/grub-devel
