On Fri, Apr 07, 2017 at 09:52:59 -0400, John Ferlan wrote:
https://bugzilla.redhat.com/show_bug.cgi?id=1439132
Fix some issues discovered when building between multiple different supported disk partition types.
Looks like a single issue.
Commit id 'a48c674fb' added a check for format types "dvh" and "pc98" to use the parted print processing instead of using blkid processing in order to validate the label on the disk was what is expected for disk pool startup. However, commit id 'a4cb4a74f' really messed things up by missing an else condition causing PARTEDFindLabel to always return DIFFERENT.
Signed-off-by: John Ferlan <jferlan@redhat.com> ---
Difference to v1: Pulled out specific patch and sent separately
src/storage/storage_util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index 784df7a..4ced81e 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -3245,8 +3245,8 @@ virStorageBackendPARTEDFindLabel(const char *device, /* Does the on disk match what the pool desired? */ if (STREQ(start, format)) ret = VIR_STORAGE_PARTED_MATCH; - - ret = VIR_STORAGE_PARTED_DIFFERENT; + else + ret = VIR_STORAGE_PARTED_DIFFERENT;
cleanup: virCommandFree(cmd);
ACK