Merge ~raharper/curtin:fix/clear-holders-detect-mpath-partition into curtin:master

[Ryan Harper]

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

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:4aa5e3fd2cd4372759988c200663716b8f937bae
https://jenkins.ubuntu.com/server/job/curtin-ci/218/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/218/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/218/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/218/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/218/

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/218//rebuild

review: Approve (continuous-integration)

[Michael Hudson-Doyle (mwhudson)]

Makes sense.

review: Approve

[Paride Legovini (paride)]

LGTM, thanks!

review: Approve

[Server Team CI bot (server-team-bot)]

Autolanding: FAILED
More details in the following jenkins job:
https://jenkins.ubuntu.com/server/job/curtin-autoland-test/261/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-autoland-test/nodes=metal-amd64/261/
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-autoland-test/nodes=metal-arm64/261/
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-autoland-test/nodes=metal-ppc64el/261/
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-autoland-test/nodes=metal-s390x/261/

review: Needs Fixing (continuous-integration)

[Paride Legovini (paride)]

Landing fails because of outdated ubuntu-distro-info (it's release day).

I put this back to "Needs review" to stop the autolander from trying to land.

[Server Team CI bot (server-team-bot)]

Autolanding: FAILED
More details in the following jenkins job:
https://jenkins.ubuntu.com/server/job/curtin-autoland-test/262/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-autoland-test/nodes=metal-amd64/262/
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-autoland-test/nodes=metal-arm64/262/
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-autoland-test/nodes=metal-ppc64el/262/
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-autoland-test/nodes=metal-s390x/262/

review: Needs Fixing (continuous-integration)

[Michael Hudson-Doyle (mwhudson)]

This can be landed now, I assume?

[Server Team CI bot (server-team-bot)]

Autolanding: FAILED
More details in the following jenkins job:
https://jenkins.ubuntu.com/server/job/curtin-autoland-test/1/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-autoland-test/nodes=metal-amd64/1/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-autoland-test/nodes=metal-arm64/1/
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-autoland-test/nodes=metal-ppc64el/1/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-autoland-test/nodes=metal-s390x/1/

review: Needs Fixing (continuous-integration)

[Server Team CI bot (server-team-bot)]

review: Approve (continuous-integration)

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