|
 |
6d3351 |
From 5c1a822cfa7993b1f55f90b75b66c86787a063d1 Mon Sep 17 00:00:00 2001
|
|
|
6d3351 |
Message-Id: <5c1a822cfa7993b1f55f90b75b66c86787a063d1@dist-git>
|
|
|
6d3351 |
From: John Ferlan <jferlan@redhat.com>
|
|
|
6d3351 |
Date: Wed, 26 Apr 2017 08:41:08 -0400
|
|
|
6d3351 |
Subject: [PATCH] disk: Resolve issues with disk partition build/start checks
|
|
|
6d3351 |
|
|
|
6d3351 |
https://bugzilla.redhat.com/show_bug.cgi?id=1439132
|
|
|
6d3351 |
|
|
|
6d3351 |
Commit id 'a48c674fb' added a check for format types "dvh" and "pc98"
|
|
|
6d3351 |
to use the parted print processing instead of using blkid processing
|
|
|
6d3351 |
in order to validate the label on the disk was what is expected for
|
|
|
6d3351 |
disk pool startup. However, commit id 'a4cb4a74f' really messed things
|
|
|
6d3351 |
up by missing an else condition causing PARTEDFindLabel to always
|
|
|
6d3351 |
return DIFFERENT.
|
|
|
6d3351 |
|
|
|
6d3351 |
Signed-off-by: John Ferlan <jferlan@redhat.com>
|
|
|
6d3351 |
(cherry picked from commit f2a123203105b4fe010aea866e87f8bcf5f31193)
|
|
|
6d3351 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
6d3351 |
---
|
|
|
6d3351 |
src/storage/storage_util.c | 4 ++--
|
|
|
6d3351 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
6d3351 |
|
|
|
6d3351 |
diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c
|
|
|
6d3351 |
index 0ceaab6b9..7a458b828 100644
|
|
|
6d3351 |
--- a/src/storage/storage_util.c
|
|
|
6d3351 |
+++ b/src/storage/storage_util.c
|
|
|
6d3351 |
@@ -3213,8 +3213,8 @@ virStorageBackendPARTEDFindLabel(const char *device,
|
|
|
6d3351 |
/* Does the on disk match what the pool desired? */
|
|
|
6d3351 |
if (STREQ(start, format))
|
|
|
6d3351 |
ret = VIR_STORAGE_PARTED_MATCH;
|
|
|
6d3351 |
-
|
|
|
6d3351 |
- ret = VIR_STORAGE_PARTED_DIFFERENT;
|
|
|
6d3351 |
+ else
|
|
|
6d3351 |
+ ret = VIR_STORAGE_PARTED_DIFFERENT;
|
|
|
6d3351 |
|
|
|
6d3351 |
cleanup:
|
|
|
6d3351 |
virCommandFree(cmd);
|
|
|
6d3351 |
--
|
|
|
6d3351 |
2.12.2
|
|
|
6d3351 |
|