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

Improve LUKS check and use luksUuid instead of uuid.

Browse source
This commit is contained in:
Teo Mrnjavac 2016-05-05 13:35:42 +02:00
parent c83e67b421
commit f861c13dad
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/modules/mount/main.py
View file

@ -30,7 +30,7 @@ def mount_partitions(root_mount_point, partitions):
:param partitions:
"""
for partition in partitions:
if not partition["mountPoint"]:
if "mountPoint" not in partition or not partition["mountPoint"]:
continue
# Create mount point with `+` rather than `os.path.join()` because
# `partition["mountPoint"]` starts with a '/'.
@ -40,7 +40,7 @@ def mount_partitions(root_mount_point, partitions):
if fstype == "fat16" or fstype == "fat32":
fstype = "vfat"
if "luksMapperName" in partition:
if partition["isLuks"]:
libcalamares.utils.debug("about to mount {!s}".format(partition["luksMapperName"]))
libcalamares.utils.mount(partition["luksMapperName"],
mount_point,