curtin-dev team mailing list archive

[Ryan Harper <rharper@xxxxxxxxxxx>]

Ryan Harper has proposed merging ~raharper/curtin:fix/clear-holders-detect-mpath-partition into curtin:master.

Commit message:
clear-holders: fix identification of multipath partitions

identify_partition calls multipath.is_mpath_partition using at sysfs
path to the device but is_mpath_partition expects a /dev/XXX path.
This prevented clear-holders from identifying multipath partitions which
need to be handled differently than regular partitions (or disks).

LP: #1900900


Requested reviews:
  curtin developers (curtin-dev)
Related bugs:
  Bug #1900900 in curtin: "Groovy install to zVM with fcp devices FAIL: removing previous storage devices"
  https://bugs.launchpad.net/curtin/+bug/1900900

For more details, see:
https://code.launchpad.net/~raharper/curtin/+git/curtin/+merge/392636
-- 
Your team curtin developers is requested to review the proposed merge of ~raharper/curtin:fix/clear-holders-detect-mpath-partition into curtin:master.

diff --git a/curtin/block/clear_holders.py b/curtin/block/clear_holders.py
index 9553db6..c182d91 100644
--- a/curtin/block/clear_holders.py
+++ b/curtin/block/clear_holders.py
@@ -396,11 +396,11 @@ def identify_partition(device):
     """
     determine if specified device is a partition
     """
-    blockdev = block.sys_block_path(device)
-    path = os.path.join(blockdev, 'partition')
+    path = os.path.join(device, 'partition')
     if os.path.exists(path):
         return True
 
+    blockdev = block.sysfs_to_devpath(device)
     if multipath.is_mpath_partition(blockdev):
         return True