diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-12-03 13:02:05 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-12-03 13:02:05 +0000 |
commit | 58240837d18e3ded66115a875c213c76fc4d7f72 (patch) | |
tree | 4c10b8264ec4c48598f694a64d2300dc8eb97e9a /app-admin/calamares/files/calamares-3.1.8-openrc-dmcrypt-cfg.patch | |
parent | 1b05fb82bf62200347e81989a0caa1da682600a4 (diff) |
app-admin/calamares : version bump (3.1.8 -> 3.1.9)
Diffstat (limited to 'app-admin/calamares/files/calamares-3.1.8-openrc-dmcrypt-cfg.patch')
-rw-r--r-- | app-admin/calamares/files/calamares-3.1.8-openrc-dmcrypt-cfg.patch | 80 |
1 files changed, 0 insertions, 80 deletions
diff --git a/app-admin/calamares/files/calamares-3.1.8-openrc-dmcrypt-cfg.patch b/app-admin/calamares/files/calamares-3.1.8-openrc-dmcrypt-cfg.patch deleted file mode 100644 index d39e3fab..00000000 --- a/app-admin/calamares/files/calamares-3.1.8-openrc-dmcrypt-cfg.patch +++ /dev/null @@ -1,80 +0,0 @@ -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 @@ -+#!/usr/bin/env python3 -+# -*- coding: utf-8 -*- -+# -+# === This file is part of Calamares - <http://github.com/calamares> === -+# -+# Copyright 2017, Ghiunhan Mamut <venerix@redcorelinux.org> -+# -+# Calamares is free software: you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation, either version 3 of the License, or -+# (at your option) any later version. -+# -+# Calamares is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with Calamares. If not, see <http://www.gnu.org/licenses/>. -+ -+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 -+ -+ elif partition["mountPoint"] == "/home" and "luksMapperName" in partition: -+ crypto_target = partition["luksMapperName"] -+ crypto_source = "/dev/disk/by-uuid/{!s}".format(partition["uuid"]) -+ 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 -+ -+ return None -+ -+ -+def run(): -+ """ -+ This module configures the OpenRC dmcrypt service for an encrypted /home partition. -+ :return: -+ """ -+ -+ root_mount_point = libcalamares.globalstorage.value("rootMountPoint") -+ dmcrypt_conf_path = libcalamares.job.configuration["configFilePath"] -+ partitions = libcalamares.globalstorage.value("partitions") -+ -+ dmcrypt_conf_path = dmcrypt_conf_path.lstrip('/') -+ -+ 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 -@@ -0,0 +1,5 @@ -+--- -+type: "job" -+name: "openrcdmcryptcfg" -+interface: "python" -+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 -@@ -0,0 +1,2 @@ -+--- -+configFilePath: /etc/conf.d/dmcrypt |