Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5f1564b3f9383dcda4b45c38d5f23407e27ea1e1
commit 5f1564b3f9383dcda4b45c38d5f23407e27ea1e1 Author: crazy <[email protected]> Date: Mon Aug 28 00:52:03 2017 +0200 calamares-frugalware-3.1.3-5-x86_64 * added patch for LUKS swap diff --git a/source/kde5-extra/calamares-frugalware/0001-packages-rework-workaround-patch.patch b/source/kde5-extra/calamares-frugalware/0001-packages-rework-workaround-patch.patch index e96f434..d5ae2fa 100644 --- a/source/kde5-extra/calamares-frugalware/0001-packages-rework-workaround-patch.patch +++ b/source/kde5-extra/calamares-frugalware/0001-packages-rework-workaround-patch.patch @@ -1,5 +1,5 @@ >From 870eedd0cd7c7295eaaf06bb26e84ecbe2a24f47 Mon Sep 17 00:00:00 2001 -From: Gabriel Craciunescu <[email protected]> +From: crazy <[email protected]> Date: Sat, 26 Aug 2017 15:51:16 +0200 Subject: [PATCH] packages: rework workaround patch diff --git a/source/kde5-extra/calamares-frugalware/0001-re-add-LUKS-resume-fix.patch b/source/kde5-extra/calamares-frugalware/0001-re-add-LUKS-resume-fix.patch new file mode 100644 index 0000000..0b0bed0 --- /dev/null +++ b/source/kde5-extra/calamares-frugalware/0001-re-add-LUKS-resume-fix.patch @@ -0,0 +1,96 @@ +From b6a4ed9c9bcc5887746b79a5dfc698aaf7f77946 Mon Sep 17 00:00:00 2001 +From: crazy <[email protected]> +Date: Sun, 27 Aug 2017 22:59:43 +0200 +Subject: [PATCH] re-add LUKS resume fix + +--- + src/modules/bootloader/main.py | 4 +++- + src/modules/fstab/main.py | 17 ++++++++++++++++- + src/modules/grubcfg/main.py | 6 ++++-- + 3 files changed, 23 insertions(+), 4 deletions(-) + +diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py +index fd5990490..6de6e84bd 100644 +--- a/src/modules/bootloader/main.py ++++ b/src/modules/bootloader/main.py +@@ -105,7 +105,7 @@ def create_systemd_boot_conf(uuid, conf_path, kernel_line): + cryptdevice_params = [] + + for partition in partitions: +- if partition["fs"] == "linuxswap": ++ if partition["fs"] == "linuxswap" and not "luksMapperName" in partition: + swap_uuid = partition["uuid"] + + if partition["mountPoint"] == "/" and "luksMapperName" in partition: +@@ -114,6 +114,8 @@ def create_systemd_boot_conf(uuid, conf_path, kernel_line): + + ":" + + partition["luksMapperName"], + "root=/dev/mapper/" ++ + partition["luksMapperName"], ++ "resume=/dev/mapper" + + partition["luksMapperName"]] + + if cryptdevice_params: +diff --git a/src/modules/fstab/main.py b/src/modules/fstab/main.py +index 9c116b8a0..9e50b2aa7 100644 +--- a/src/modules/fstab/main.py ++++ b/src/modules/fstab/main.py +@@ -262,8 +262,23 @@ class FstabGenerator(object): + check=check, + ) + ++ if filesystem == "swap" and "luksMapperName" in partition: ++ return dict(device="/dev/mapper/" + partition["luksMapperName"], ++ mount_point=mount_point or "swap", ++ fs=filesystem, ++ options=options, ++ check=check, ++ ) ++ else: ++ return dict(device="UUID=" + partition["uuid"], ++ mount_point=mount_point or "swap", ++ fs=filesystem, ++ options=options, ++ check=check, ++ ) ++ + return dict(device="UUID=" + partition["uuid"], +- mount_point=mount_point or "swap", ++ mount_point=mount_point, + fs=filesystem, + options=options, + check=check, +diff --git a/src/modules/grubcfg/main.py b/src/modules/grubcfg/main.py +index 59497cf03..3db9bc33e 100644 +--- a/src/modules/grubcfg/main.py ++++ b/src/modules/grubcfg/main.py +@@ -52,7 +52,8 @@ def modify_grub_default(partitions, root_mount_point, distributor): + + if dracut_bin == 0: + for partition in partitions: +- if partition["fs"] == "linuxswap": ++ ## ugly ++ if partition["fs"] == "linuxswap" and not "luksMapperName" in partition: + swap_uuid = partition["uuid"] + + if (partition["fs"] == "linuxswap" +@@ -66,7 +67,7 @@ def modify_grub_default(partitions, root_mount_point, distributor): + ] + else: + for partition in partitions: +- if partition["fs"] == "linuxswap": ++ if partition["fs"] == "linuxswap" and not "luksMapperName" in partition: + swap_uuid = partition["uuid"] + + if (partition["mountPoint"] == "/" +@@ -90,6 +91,7 @@ def modify_grub_default(partitions, root_mount_point, distributor): + kernel_params.append("resume=UUID={!s}".format(swap_uuid)) + + if dracut_bin == 0 and swap_outer_uuid: ++ kernel_params.append("resume=/dev/mapper/{!s}".format(partition["luksMapperName"])) + kernel_params.append("rd.luks.uuid={!s}".format(swap_outer_uuid)) + + distributor_line = "GRUB_DISTRIBUTOR='{!s}'".format(distributor_replace) +-- +2.14.1 + diff --git a/source/kde5-extra/calamares-frugalware/FrugalBuild b/source/kde5-extra/calamares-frugalware/FrugalBuild index 8b1e3f2..ad280a1 100644 --- a/source/kde5-extra/calamares-frugalware/FrugalBuild +++ b/source/kde5-extra/calamares-frugalware/FrugalBuild @@ -3,7 +3,7 @@ pkgname=calamares-frugalware pkgver=3.1.3 -pkgrel=4 +pkgrel=5 pkgdesc="Distribution-independent installer framework" archs=("x86_64") groups=('kde5-extra') @@ -14,6 +14,7 @@ Finclude kf5 github source+=(calamares-locale.service \ calamares-locale-setup \ 0001-packages-rework-workaround-patch.patch \ + 0001-re-add-LUKS-resume-fix.patch \ calamares-frugalware.desktop \ calamares-frugalware.svg 49-nopasswd_calamares.rules) depends=('kpmcore>=3.1.2' 'qt5-webengine>=5.9.1' 'pyqt5-python3>=5.9' 'libboost' \ @@ -26,7 +27,8 @@ _F_cd_path="calamares-$pkgver" sha1sums=('7cf6eaff31538e3ea91d49a69ef96dee172e5739' \ 'a496ee65a14fad4c96fe2a51d59f5769a9286411' \ 'abd9098e0b3f988182a4b0f3173bffb9f0f7c215' \ - '420f3ee3cef0549dc2230853720174619c4a803f' \ + '4872cc5fe5747953540abb67e3460e3a9cf3b12e' \ + 'ab0d44800b89f1cb59d1e4b1e4d3b5baccefafa8' \ '10a6590d410507c48ed84876ff2ebd380c793034' \ '134ca1a53f3b628ba459ec450e84ea0b4f0c11f2' \ '02e4c49a4ff57712ffa94dbb79abc1dd701692c7') _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
