From 5ddd0f523ba6adfefb9871759767c862412fae5c Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Thu, 5 May 2016 13:54:15 +0200 Subject: [PATCH] Use luksMapperName as check. --- src/modules/bootloader/main.py | 2 +- src/modules/grubcfg/main.py | 2 +- src/modules/mount/main.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py index 1e77da68e..386eaad2b 100644 --- a/src/modules/bootloader/main.py +++ b/src/modules/bootloader/main.py @@ -100,7 +100,7 @@ def create_systemd_boot_conf(uuid, conf_path, kernel_line): if partition["fs"] == "linuxswap": swap_uuid = partition["uuid"] - if partition["mountPoint"] == "/" and partition["isLuks"]: + if partition["mountPoint"] == "/" and "luksMapperName" in partition: cryptdevice_params = [ "cryptdevice=UUID={!s}:{!s}".format(partition["luksUuid"], partition["luksMapperName"]), diff --git a/src/modules/grubcfg/main.py b/src/modules/grubcfg/main.py index 3c3718a4c..c8647cde4 100644 --- a/src/modules/grubcfg/main.py +++ b/src/modules/grubcfg/main.py @@ -50,7 +50,7 @@ def modify_grub_default(partitions, root_mount_point, distributor): if partition["fs"] == "linuxswap": swap_uuid = partition["uuid"] - if partition["mountPoint"] == "/" and partition["isLuks"]: + if partition["mountPoint"] == "/" and "luksMapperName" in partition: cryptdevice_params = [ "cryptdevice=UUID={!s}:{!s}".format(partition["luksUuid"], partition["luksMapperName"]), diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py index 51abe0591..92fd8f128 100644 --- a/src/modules/mount/main.py +++ b/src/modules/mount/main.py @@ -40,7 +40,7 @@ def mount_partitions(root_mount_point, partitions): if fstype == "fat16" or fstype == "fat32": fstype = "vfat" - if partition["isLuks"]: + if "luksMapperName" in partition: libcalamares.utils.debug("about to mount {!s}".format(partition["luksMapperName"])) libcalamares.utils.mount(partition["luksMapperName"], mount_point,