From f2a123203105b4fe010aea866e87f8bcf5f31193 Mon Sep 17 00:00:00 2001 From: John Ferlan Date: Fri, 7 Apr 2017 07:02:40 -0400 Subject: [PATCH] disk: Resolve issues with disk partition build/start checks https://bugzilla.redhat.com/show_bug.cgi?id=1439132 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 --- 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 8e25984d75..b344fdfda5 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);