curtin-dev team mailing list archive

[Lukas Märdian <lukas.maerdian@xxxxxxxxxxxxx>]

Lukas Märdian has proposed merging ~slyon/curtin:slyon/lp1895192-zkey into curtin:master.

Commit message:
block: handle /dev/mapper/* in dev_path()

Fixes LP: #1895192


Requested reviews:
  Michael Hudson-Doyle (mwhudson)
Related bugs:
  Bug #1895192 in curtin: "Optimistic approach of using zkey for encrypted installations on s390x not working"
  https://bugs.launchpad.net/curtin/+bug/1895192

For more details, see:
https://code.launchpad.net/~slyon/curtin/+git/curtin/+merge/406598

block: handle /dev/mapper/* in dev_path()

Fixes LP: #1895192

-- 
Your team curtin developers is subscribed to branch curtin:master.

diff --git a/curtin/block/__init__.py b/curtin/block/__init__.py
index 2580a0d..a33ccf2 100644
--- a/curtin/block/__init__.py
+++ b/curtin/block/__init__.py
@@ -62,7 +62,8 @@ def dev_path(devname):
     convert device name to path in /dev
     """
     if devname.startswith('/dev/'):
-        return devname
+        # it could be something like /dev/mapper/mpatha-part2
+        return os.path.realpath(devname)
     else:
         return '/dev/' + devname