From f861c13dadf0bf7d0f9049fde55f5f67f004f23a Mon Sep 17 00:00:00 2001
From: Teo Mrnjavac <teo@kde.org>
Date: Thu, 5 May 2016 13:35:42 +0200
Subject: [PATCH] Improve LUKS check and use luksUuid instead of uuid.

---
 src/modules/bootloader/main.py | 4 ++--
 src/modules/grubcfg/main.py    | 4 ++--
 src/modules/mount/main.py      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py
index 69ebb20e4..1e77da68e 100644
--- a/src/modules/bootloader/main.py
+++ b/src/modules/bootloader/main.py
@@ -100,9 +100,9 @@ def create_systemd_boot_conf(uuid, conf_path, kernel_line):
         if partition["fs"] == "linuxswap":
             swap_uuid = partition["uuid"]
 
-        if partition["mountPoint"] == "/" and "luksMapperName" in partition:
+        if partition["mountPoint"] == "/" and partition["isLuks"]:
             cryptdevice_params = [
-                "cryptdevice=UUID={!s}:{!s}".format(partition["uuid"],
+                "cryptdevice=UUID={!s}:{!s}".format(partition["luksUuid"],
                                                     partition["luksMapperName"]),
                 "root=/dev/mapper/{!s}".format(partition["luksMapperName"])
             ]
diff --git a/src/modules/grubcfg/main.py b/src/modules/grubcfg/main.py
index fffb74715..3c3718a4c 100644
--- a/src/modules/grubcfg/main.py
+++ b/src/modules/grubcfg/main.py
@@ -50,9 +50,9 @@ def modify_grub_default(partitions, root_mount_point, distributor):
         if partition["fs"] == "linuxswap":
             swap_uuid = partition["uuid"]
 
-        if partition["mountPoint"] == "/" and "luksMapperName" in partition:
+        if partition["mountPoint"] == "/" and partition["isLuks"]:
             cryptdevice_params = [
-                "cryptdevice=UUID={!s}:{!s}".format(partition["uuid"],
+                "cryptdevice=UUID={!s}:{!s}".format(partition["luksUuid"],
                                                     partition["luksMapperName"]),
                 "root=/dev/mapper/{!s}".format(partition["luksMapperName"])
             ]
diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py
index 512e46cf0..51abe0591 100644
--- a/src/modules/mount/main.py
+++ b/src/modules/mount/main.py
@@ -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,