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

Proper check for luksMapperName key.

Browse Source
This commit is contained in:
Teo Mrnjavac 2016-05-05 12:49:58 +02:00
parent b792ea0216
commit e1ee6e181a
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/bootloader/main.py
View File

@ -100,7 +100,7 @@ def create_systemd_boot_conf(uuid, conf_path, kernel_line):
if partition["fs"] == "linuxswap": if partition["fs"] == "linuxswap":
swap_uuid = partition["uuid"] swap_uuid = partition["uuid"]
if partition["mountPoint"] == "/" and partition["luksMapperName"]: if partition["mountPoint"] == "/" and "luksMapperName" in partition:
cryptdevice_params = [ cryptdevice_params = [
"cryptdevice=UUID={!s}:{!s}".format(partition["uuid"], "cryptdevice=UUID={!s}:{!s}".format(partition["uuid"],
partition["luksMapperName"]), partition["luksMapperName"]),

2
src/modules/grubcfg/main.py
View File

@ -50,7 +50,7 @@ def modify_grub_default(partitions, root_mount_point, distributor):
if partition["fs"] == "linuxswap": if partition["fs"] == "linuxswap":
swap_uuid = partition["uuid"] swap_uuid = partition["uuid"]
if partition["mountPoint"] == "/" and partition["luksMapperName"]: if partition["mountPoint"] == "/" and "luksMapperName" in partition:
cryptdevice_params = [ cryptdevice_params = [
"cryptdevice=UUID={!s}:{!s}".format(partition["uuid"], "cryptdevice=UUID={!s}:{!s}".format(partition["uuid"],
partition["luksMapperName"]), partition["luksMapperName"]),

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

@ -40,7 +40,8 @@ def mount_partitions(root_mount_point, partitions):
if fstype == "fat16" or fstype == "fat32": if fstype == "fat16" or fstype == "fat32":
fstype = "vfat" fstype = "vfat"
if partition["luksMapperName"]: if "luksMapperName" in partition:
libcalamares.utils.debug("about to mount {!s}".format(partition["luksMapperName"]))
libcalamares.utils.mount(partition["luksMapperName"], libcalamares.utils.mount(partition["luksMapperName"],
mount_point, mount_point,
fstype, fstype,