|
 |
34c36b |
From 8bdade5e60b746e8d992289e71123ad27146a7f1 Mon Sep 17 00:00:00 2001
|
|
|
34c36b |
From: David Lehman <dlehman@redhat.com>
|
|
|
34c36b |
Date: Wed, 24 Oct 2018 20:08:48 -0400
|
|
|
34c36b |
Subject: [PATCH 2/2] Use udev to determine if disk is a multipath member.
|
|
|
34c36b |
|
|
|
34c36b |
Related: rhbz#1575953
|
|
|
34c36b |
---
|
|
|
34c36b |
blivet/populator/helpers/disklabel.py | 3 +--
|
|
|
34c36b |
tests/populator_test.py | 6 ++----
|
|
|
34c36b |
2 files changed, 3 insertions(+), 6 deletions(-)
|
|
|
34c36b |
|
|
|
34c36b |
diff --git a/blivet/populator/helpers/disklabel.py b/blivet/populator/helpers/disklabel.py
|
|
|
34c36b |
index c2acb117..db10638e 100644
|
|
|
34c36b |
--- a/blivet/populator/helpers/disklabel.py
|
|
|
34c36b |
+++ b/blivet/populator/helpers/disklabel.py
|
|
|
34c36b |
@@ -28,7 +28,6 @@ from ... import udev
|
|
|
34c36b |
from ...errors import InvalidDiskLabelError
|
|
|
34c36b |
from ...storage_log import log_exception_info, log_method_call
|
|
|
34c36b |
from .formatpopulator import FormatPopulator
|
|
|
34c36b |
-from ...static_data import mpath_members
|
|
|
34c36b |
|
|
|
34c36b |
import logging
|
|
|
34c36b |
log = logging.getLogger("blivet")
|
|
|
34c36b |
@@ -44,7 +43,7 @@ class DiskLabelFormatPopulator(FormatPopulator):
|
|
|
34c36b |
return (bool(udev.device_get_disklabel_type(data)) and
|
|
|
34c36b |
not udev.device_is_biosraid_member(data) and
|
|
|
34c36b |
udev.device_get_format(data) != "iso9660" and
|
|
|
34c36b |
- not (device.is_disk and mpath_members.is_mpath_member(device.path)))
|
|
|
34c36b |
+ not (device.is_disk and udev.device_get_format(data) == "mpath_member"))
|
|
|
34c36b |
|
|
|
34c36b |
def _get_kwargs(self):
|
|
|
34c36b |
kwargs = super(DiskLabelFormatPopulator, self)._get_kwargs()
|
|
|
34c36b |
--
|
|
|
34c36b |
2.17.2
|
|
|
34c36b |
|