napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Teo Mrnjavac 2016-04-30 16:34:34 +02:00
parent 126ad300ae
commit f5f73fbd4d
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/modules/mount/main.py
View File

@ -40,11 +40,19 @@ def mount_partitions(root_mount_point, partitions):
if fstype == "fat16" or fstype == "fat32": if fstype == "fat16" or fstype == "fat32":
fstype = "vfat" fstype = "vfat"
libcalamares.utils.mount(partition["device"], if partition["luksMapperName"]:
mount_point, libcalamares.utils.mount(partition["luksMapperName"],
fstype, mount_point,
partition.get("options", ""), fstype,
) partition.get("options", ""),
)
else:
libcalamares.utils.mount(partition["device"],
mount_point,
fstype,
partition.get("options", ""),
)
def run(): def run():