Use the mapper name to mount if it's a LUKS partition.

2016-04-30 16:34:34 +02:00 · 2016-04-30 16:34:34 +02:00 · f5f73fbd4d
commit f5f73fbd4d
parent 126ad300ae
1 changed files with 13 additions and 5 deletions
--- a/src/modules/mount/main.py
+++ b/src/modules/mount/main.py
@ -40,11 +40,19 @@ def mount_partitions(root_mount_point, partitions):
        if fstype == "fat16" or fstype == "fat32":
            fstype = "vfat"

-        libcalamares.utils.mount(partition["device"],
-                                 mount_point,
-                                 fstype,
-                                 partition.get("options", ""),
-                                 )
+        if partition["luksMapperName"]:
+            libcalamares.utils.mount(partition["luksMapperName"],
+                                     mount_point,
+                                     fstype,
+                                     partition.get("options", ""),
+                                     )
+
+        else:
+            libcalamares.utils.mount(partition["device"],
+                                     mount_point,
+                                     fstype,
+                                     partition.get("options", ""),
+                                     )


 def run():