app-admin/calamares : version bump (3.1.8 -> 3.1.9)

3 files changed, 17 insertions, 13 deletions

diff --git a/app-admin/calamares/files/calamares-3.1.8-dont-run-locale-gen.patch b/app-admin/calamares/files/calamares-dont-run-locale-gen.patch
index 29ca6a61..29ca6a61 100644
--- a/app-admin/calamares/files/calamares-3.1.8-dont-run-locale-gen.patch
+++ b/app-admin/calamares/files/calamares-dont-run-locale-gen.patch
diff --git a/app-admin/calamares/files/calamares-3.1.8-kpmcore-3.2.patch b/app-admin/calamares/files/calamares-kpmcore-3.2.patch
index 07e506ec..07e506ec 100644
--- a/app-admin/calamares/files/calamares-3.1.8-kpmcore-3.2.patch
+++ b/app-admin/calamares/files/calamares-kpmcore-3.2.patch
diff --git a/app-admin/calamares/files/calamares-3.1.8-openrc-dmcrypt-cfg.patch b/app-admin/calamares/files/calamares-openrc-dmcrypt-cfg-r1.patch
index d39e3fab..67279b7c 100644
--- a/app-admin/calamares/files/calamares-3.1.8-openrc-dmcrypt-cfg.patch
+++ b/app-admin/calamares/files/calamares-openrc-dmcrypt-cfg-r1.patch
@@ -1,7 +1,7 @@
 diff -Nur a/src/modules/openrcdmcryptcfg/main.py b/src/modules/openrcdmcryptcfg/main.py
 --- a/src/modules/openrcdmcryptcfg/main.py	1970-01-01 01:00:00.000000000 +0100
-+++ b/src/modules/openrcdmcryptcfg/main.py	2017-08-22 19:23:32.660085460 +0100
-@@ -0,0 +1,61 @@
++++ b/src/modules/openrcdmcryptcfg/main.py	2017-12-02 19:40:18.212303089 +0000
+@@ -0,0 +1,65 @@
 +#!/usr/bin/env python3
 +# -*- coding: utf-8 -*-
 +#
@@ -25,34 +25,38 @@ diff -Nur a/src/modules/openrcdmcryptcfg/main.py b/src/modules/openrcdmcryptcfg/
 +import libcalamares
 +import os.path
 +
-+
 +def write_dmcrypt_conf(partitions, root_mount_point, dmcrypt_conf_path):
 +    crypto_target = ""
 +    crypto_source = ""
 +
 +    for partition in partitions:
-+        if partition["mountPoint"] == "/home" and not "luksMapperName" in partition:
-+            pass
++        has_luks = "luksMapperName" in partition
++        skip_partitions = partition["mountPoint"] == "/" or partition["fs"] == "linuxswap"
++
++        if not has_luks and not skip_partitions:
++            libcalamares.utils.debug(
++                "Skip writing OpenRC LUKS configuration for partition {!s}".format(partition["mountPoint"]))
 +
-+        elif partition["mountPoint"] == "/home" and "luksMapperName" in partition:
++        if has_luks and not skip_partitions:
 +            crypto_target = partition["luksMapperName"]
 +            crypto_source = "/dev/disk/by-uuid/{!s}".format(partition["uuid"])
++            libcalamares.utils.debug(
++                "Writing OpenRC LUKS configuration for partition {!s}".format(partition["mountPoint"]))
++
 +            with open(os.path.join(root_mount_point, dmcrypt_conf_path), 'a+') as dmcrypt_file:
 +                dmcrypt_file.write("\ntarget=" + crypto_target)
 +                dmcrypt_file.write("\nsource=" + crypto_source)
 +                dmcrypt_file.write("\nkey=/crypto_keyfile.bin")
 +                dmcrypt_file.write("\n")
-+                dmcrypt_file.close()
 +
-+        elif not partition["mountPoint"] == "/home" in partition:
-+            pass
++        if has_luks and skip_partitions:
++            pass  # root and swap partitions should be handled by initramfs generators
 +
 +    return None
 +
-+
 +def run():
 +    """
-+    This module configures the OpenRC dmcrypt service for an encrypted /home partition.
++    This module configures OpenRC dmcrypt service for LUKS encrypted partitions.
 +    :return:
 +    """
 +
@@ -65,7 +69,7 @@ diff -Nur a/src/modules/openrcdmcryptcfg/main.py b/src/modules/openrcdmcryptcfg/
 +    return write_dmcrypt_conf(partitions, root_mount_point, dmcrypt_conf_path)
 diff -Nur a/src/modules/openrcdmcryptcfg/module.desc b/src/modules/openrcdmcryptcfg/module.desc
 --- a/src/modules/openrcdmcryptcfg/module.desc	1970-01-01 01:00:00.000000000 +0100
-+++ b/src/modules/openrcdmcryptcfg/module.desc	2017-08-22 13:11:15.198714035 +0100
++++ b/src/modules/openrcdmcryptcfg/module.desc	2017-12-02 16:48:49.663145918 +0000
 @@ -0,0 +1,5 @@
 +---
 +type:       "job"
@@ -74,7 +78,7 @@ diff -Nur a/src/modules/openrcdmcryptcfg/module.desc b/src/modules/openrcdmcrypt
 +script:     "main.py"
 diff -Nur a/src/modules/openrcdmcryptcfg/openrcdmcryptcfg.conf b/src/modules/openrcdmcryptcfg/openrcdmcryptcfg.conf
 --- a/src/modules/openrcdmcryptcfg/openrcdmcryptcfg.conf	1970-01-01 01:00:00.000000000 +0100
-+++ b/src/modules/openrcdmcryptcfg/openrcdmcryptcfg.conf	2017-08-22 13:11:15.198714035 +0100
++++ b/src/modules/openrcdmcryptcfg/openrcdmcryptcfg.conf	2017-12-02 16:48:49.663145918 +0000
 @@ -0,0 +1,2 @@
 +---
 +configFilePath: /etc/conf.d/dmcrypt