diff options
| -rw-r--r-- | app-admin/calamares/Manifest | 2 | ||||
| -rw-r--r-- | app-admin/calamares/calamares-3.1.9.ebuild (renamed from app-admin/calamares/calamares-3.1.8-r3.ebuild) | 8 | ||||
| -rw-r--r-- | app-admin/calamares/files/calamares-dont-run-locale-gen.patch (renamed from app-admin/calamares/files/calamares-3.1.8-dont-run-locale-gen.patch) | 0 | ||||
| -rw-r--r-- | app-admin/calamares/files/calamares-kpmcore-3.2.patch (renamed from app-admin/calamares/files/calamares-3.1.8-kpmcore-3.2.patch) | 0 | ||||
| -rw-r--r-- | app-admin/calamares/files/calamares-openrc-dmcrypt-cfg-r1.patch (renamed from app-admin/calamares/files/calamares-3.1.8-openrc-dmcrypt-cfg.patch) | 30 |
5 files changed, 22 insertions, 18 deletions
diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest index 20c7d15c..d27c74f1 100644 --- a/app-admin/calamares/Manifest +++ b/app-admin/calamares/Manifest @@ -1 +1 @@ -DIST calamares-3.1.8.tar.gz 2265097 SHA256 abc3d44285a17175a1cf2ca69e4b89ab207927edc4d0c0ce48253f8e0a61c007 SHA512 f5fe3e92357d2f7492298b26826da420862438e55f91be6f8d9414d332c2f4b74d382d1c128d78e453609a9a2bc79b423c5e331a295479d169ed76a7028f0375 WHIRLPOOL 43cc8bb2ce073e4b632fa8da71fbd3132b60fb5a85786cde8996e91cfa1c91b695279d52853e34da4c63a4344489120c20f8ab843c77d2ba69d114bb877d4a0a +DIST calamares-3.1.9.tar.gz 2265530 SHA256 126bb8a653a10f6cf55d6fa4abfe1021e23b75f3a3b533d827cb8e1c4acffe44 SHA512 d8c0ceab9999ce1b28565ac9b241c0b45a56c8d27cd3bd84ca0ee8fe59a3684b9b871fbad5437da1a0073f56aacee94a35a6d60303f0ef0871a740282e8bacfc WHIRLPOOL 15afc512605bb4714e08f41b31c1542786fdaf3326ddd5c681dcf8d349256d9ab7acbfec81678cdb4ba2e6b4d2b87b8426f1444c9c25e879808f0d40573a7d93 diff --git a/app-admin/calamares/calamares-3.1.8-r3.ebuild b/app-admin/calamares/calamares-3.1.9.ebuild index 067d28b0..6475e2ac 100644 --- a/app-admin/calamares/calamares-3.1.8-r3.ebuild +++ b/app-admin/calamares/calamares-3.1.9.ebuild @@ -49,11 +49,11 @@ RDEPEND=">=app-misc/calamares-runtime-1.0[branding]" src_prepare() { # build against kpmcore-3.2 - epatch "${FILESDIR}"/${P}-kpmcore-3.2.patch + epatch "${FILESDIR}"/${PN}-kpmcore-3.2.patch # don't run locale-gen during system installation, we run it ourselves during stage4 bootstrap...this patch should speed up installation significantly - epatch "${FILESDIR}"/${P}-dont-run-locale-gen.patch - # support auto-unlocking encrypted /home partition via OpenRC's dmcrypt service - epatch -p1 "${FILESDIR}"/${P}-openrc-dmcrypt-cfg.patch + epatch "${FILESDIR}"/${PN}-dont-run-locale-gen.patch + # support auto-unlocking encrypted partitions via OpenRC's dmcrypt service + epatch -p1 "${FILESDIR}"/${PN}-openrc-dmcrypt-cfg-r1.patch # replace calamares installer desktop icon sed -i "s/Icon=calamares/Icon=redcore-logo/g" "${S}/calamares.desktop" # fix installer doesn't start from desktop launcher (IMPROVE THIS UGLY THINGY) 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 |