Blob Blame History Raw
From 8bdade5e60b746e8d992289e71123ad27146a7f1 Mon Sep 17 00:00:00 2001
From: David Lehman <dlehman@redhat.com>
Date: Wed, 24 Oct 2018 20:08:48 -0400
Subject: [PATCH 2/2] Use udev to determine if disk is a multipath member.

Related: rhbz#1575953
---
 blivet/populator/helpers/disklabel.py | 3 +--
 tests/populator_test.py               | 6 ++----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/blivet/populator/helpers/disklabel.py b/blivet/populator/helpers/disklabel.py
index c2acb117..db10638e 100644
--- a/blivet/populator/helpers/disklabel.py
+++ b/blivet/populator/helpers/disklabel.py
@@ -28,7 +28,6 @@ from ... import udev
 from ...errors import InvalidDiskLabelError
 from ...storage_log import log_exception_info, log_method_call
 from .formatpopulator import FormatPopulator
-from ...static_data import mpath_members
 
 import logging
 log = logging.getLogger("blivet")
@@ -44,7 +43,7 @@ class DiskLabelFormatPopulator(FormatPopulator):
         return (bool(udev.device_get_disklabel_type(data)) and
                 not udev.device_is_biosraid_member(data) and
                 udev.device_get_format(data) != "iso9660" and
-                not (device.is_disk and mpath_members.is_mpath_member(device.path)))
+                not (device.is_disk and udev.device_get_format(data) == "mpath_member"))
 
     def _get_kwargs(self):
         kwargs = super(DiskLabelFormatPopulator, self)._get_kwargs()
-- 
2.17.2