applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-27 09:25:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
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":
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():