diff --git a/ChangeLog b/ChangeLog index 0f3938f26396e4c7a64786fdebddf0c60fb93b9f..ec4cd95dbfdc0642b73ba6241dc90a46197978c9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Apr 29 09:15:00 BST 2008 Richard W.M. Jones + + * src/parthelper.c: Don't fail if PED_PARTITION_PROTECTED + is not defined because of ancient libparted + (Soren Hansen). + Mon Apr 28 17:24:22 EST 2008 Daniel P. Berrange * src/memory.h, src/memory.c: Added safer APIs for dealing diff --git a/src/parthelper.c b/src/parthelper.c index d593c49fc005d4d008f9677678953da8eebb3226..a0fe2416391cf1f016e262e04e225ead0cd8bae6 100644 --- a/src/parthelper.c +++ b/src/parthelper.c @@ -67,8 +67,10 @@ int main(int argc, char **argv) content = "free"; else if (part->type & PED_PARTITION_METADATA) content = "metadata"; +#ifdef PED_PARTITION_PROTECTED else if (part->type & PED_PARTITION_PROTECTED) content = "protected"; +#endif else content = "data"; } else if (part->type == PED_PARTITION_EXTENDED) { @@ -80,8 +82,10 @@ int main(int argc, char **argv) content = "free"; else if (part->type & PED_PARTITION_METADATA) content = "metadata"; +#ifdef PED_PARTITION_PROTECTED else if (part->type & PED_PARTITION_PROTECTED) content = "protected"; +#endif else content = "data"; }