From d1394fe29f1e878bc008eacbb50b949d8d332b42 Mon Sep 17 00:00:00 2001 From: olf Date: Wed, 5 May 2021 02:28:53 +0200 Subject: [PATCH 01/17] Update LICENSE --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index ea5c2732..1024d497 100644 --- a/LICENSE +++ b/LICENSE @@ -471,7 +471,7 @@ convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. crypto-sdcard - Copyright (C) 2018 - 2021+ olf + Copyright (C) 2018 to 2021+ olf This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public From cfcc29681559cbd42c1c432b27ec2ff8c67badfa Mon Sep 17 00:00:00 2001 From: olf Date: Mon, 17 May 2021 02:18:39 +0200 Subject: [PATCH 02/17] Create changelog-template.md --- changelog-template.md | 151 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 151 insertions(+) create mode 100644 changelog-template.md diff --git a/changelog-template.md b/changelog-template.md new file mode 100644 index 00000000..6728a3d0 --- /dev/null +++ b/changelog-template.md @@ -0,0 +1,151 @@ +# Changelog +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [Unreleased] + +## [1.0.0] - 2017-06-20 +### Added +- New visual identity by [@tylerfortune8](https://github.com/tylerfortune8). +- Version navigation. +- Links to latest released version in previous versions. +- "Why keep a changelog?" section. +- "Who needs a changelog?" section. +- "How do I make a changelog?" section. +- "Frequently Asked Questions" section. +- New "Guiding Principles" sub-section to "How do I make a changelog?". +- Simplified and Traditional Chinese translations from [@tianshuo](https://github.com/tianshuo). +- German translation from [@mpbzh](https://github.com/mpbzh) & [@Art4](https://github.com/Art4). +- Italian translation from [@azkidenz](https://github.com/azkidenz). +- Swedish translation from [@magol](https://github.com/magol). +- Turkish translation from [@karalamalar](https://github.com/karalamalar). +- French translation from [@zapashcanon](https://github.com/zapashcanon). +- Brazilian Portugese translation from [@Webysther](https://github.com/Webysther). +- Polish translation from [@amielucha](https://github.com/amielucha) & [@m-aciek](https://github.com/m-aciek). +- Russian translation from [@aishek](https://github.com/aishek). +- Czech translation from [@h4vry](https://github.com/h4vry). +- Slovak translation from [@jkostolansky](https://github.com/jkostolansky). +- Korean translation from [@pierceh89](https://github.com/pierceh89). +- Croatian translation from [@porx](https://github.com/porx). +- Persian translation from [@Hameds](https://github.com/Hameds). +- Ukrainian translation from [@osadchyi-s](https://github.com/osadchyi-s). + +### Changed +- Start using "changelog" over "change log" since it's the common usage. +- Start versioning based on the current English version at 0.3.0 to help +translation authors keep things up-to-date. +- Rewrite "What makes unicorns cry?" section. +- Rewrite "Ignoring Deprecations" sub-section to clarify the ideal + scenario. +- Improve "Commit log diffs" sub-section to further argument against + them. +- Merge "Why can’t people just use a git log diff?" with "Commit log + diffs" +- Fix typos in Simplified Chinese and Traditional Chinese translations. +- Fix typos in Brazilian Portuguese translation. +- Fix typos in Turkish translation. +- Fix typos in Czech translation. +- Fix typos in Swedish translation. +- Improve phrasing in French translation. +- Fix phrasing and spelling in German translation. + +### Removed +- Section about "changelog" vs "CHANGELOG". + +## [0.3.0] - 2015-12-03 +### Added +- RU translation from [@aishek](https://github.com/aishek). +- pt-BR translation from [@tallesl](https://github.com/tallesl). +- es-ES translation from [@ZeliosAriex](https://github.com/ZeliosAriex). + +## [0.2.0] - 2015-10-06 +### Changed +- Remove exclusionary mentions of "open source" since this project can +benefit both "open" and "closed" source projects equally. + +## [0.1.0] - 2015-10-06 +### Added +- Answer "Should you ever rewrite a change log?". + +### Changed +- Improve argument against commit logs. +- Start following [SemVer](https://semver.org) properly. + +## [0.0.8] - 2015-02-17 +### Changed +- Update year to match in every README example. +- Reluctantly stop making fun of Brits only, since most of the world + writes dates in a strange way. + +### Fixed +- Fix typos in recent README changes. +- Update outdated unreleased diff link. + +## [0.0.7] - 2015-02-16 +### Added +- Link, and make it obvious that date format is ISO 8601. + +### Changed +- Clarified the section on "Is there a standard change log format?". + +### Fixed +- Fix Markdown links to tag comparison URL with footnote-style links. + +## [0.0.6] - 2014-12-12 +### Added +- README section on "yanked" releases. + +## [0.0.5] - 2014-08-09 +### Added +- Markdown links to version tags on release headings. +- Unreleased section to gather unreleased changes and encourage note +keeping prior to releases. + +## [0.0.4] - 2014-08-09 +### Added +- Better explanation of the difference between the file ("CHANGELOG") +and its function "the change log". + +### Changed +- Refer to a "change log" instead of a "CHANGELOG" throughout the site +to differentiate between the file and the purpose of the file — the +logging of changes. + +### Removed +- Remove empty sections from CHANGELOG, they occupy too much space and +create too much noise in the file. People will have to assume that the +missing sections were intentionally left out because they contained no +notable changes. + +## [0.0.3] - 2014-08-09 +### Added +- "Why should I care?" section mentioning The Changelog podcast. + +## [0.0.2] - 2014-07-10 +### Added +- Explanation of the recommended reverse chronological release ordering. + +## [0.0.1] - 2014-05-31 +### Added +- This CHANGELOG file to hopefully serve as an evolving example of a + standardized open source project CHANGELOG. +- CNAME file to enable GitHub Pages custom domain +- README now contains answers to common questions about CHANGELOGs +- Good examples and basic guidelines, including proper date formatting. +- Counter-examples: "What makes unicorns cry?" + +[Unreleased]: https://github.com/olivierlacan/keep-a-changelog/compare/v1.0.0...HEAD +[1.0.0]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.3.0...v1.0.0 +[0.3.0]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.2.0...v0.3.0 +[0.2.0]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.1.0...v0.2.0 +[0.1.0]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.0.8...v0.1.0 +[0.0.8]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.0.7...v0.0.8 +[0.0.7]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.0.6...v0.0.7 +[0.0.6]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.0.5...v0.0.6 +[0.0.5]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.0.4...v0.0.5 +[0.0.4]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.0.3...v0.0.4 +[0.0.3]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.0.2...v0.0.3 +[0.0.2]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.0.1...v0.0.2 +[0.0.1]: https://github.com/olivierlacan/keep-a-changelog/releases/tag/v0.0.1 From 4d7982d908bdd4cfc574fcc2e24bcfead32c9bb6 Mon Sep 17 00:00:00 2001 From: olf Date: Sat, 22 May 2021 23:30:12 +0200 Subject: [PATCH 03/17] Reference specific versions --- changelog-template.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/changelog-template.md b/changelog-template.md index 6728a3d0..2b1526ce 100644 --- a/changelog-template.md +++ b/changelog-template.md @@ -1,8 +1,8 @@ # Changelog All notable changes to this project will be documented in this file. -The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), -and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +The format is based on [Keep a Changelog v1.1.0](https://keepachangelog.com/en/1.1.0/), +and this project adheres to [Semantic Versioning v2.0.0](https://semver.org/spec/v2.0.0.html). ## [Unreleased] From a87cb0c68d85db8f65fc52b37b4285aaba7fc782 Mon Sep 17 00:00:00 2001 From: olf Date: Sun, 23 May 2021 00:08:32 +0200 Subject: [PATCH 04/17] Create CHANGELOG.md --- CHANGELOG.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 00000000..cd815179 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,25 @@ +# Changelog +All notable changes to *crypto-sdcard* since v1.7.2 will be documented in this file. + +The format is based on [Keep a Changelog v1.1.0](https://keepachangelog.com/en/1.1.0/), +and this project adheres to [Semantic Versioning v2.0.0](https://semver.org/spec/v2.0.0.html). + +## [Unreleased] + +## [1.7.2] - 2021-05-23 +### Added +- foo +### Changed +- bar +### Removed +- foobar + +## Versions [before 1.7.2] - 2018-2021 +See [original thread at TJC](https://together.jolla.com/question/179054/how-to-creating-partitions-on-sd-card-optionally-encrypted/?answer=189813#post-id-189813), +the [course version history in the README](https://github.com/Olf0/crypto-sdcard#version-history) and +the [detailed version specific reease notes](https://github.com/Olf0/crypto-sdcard/releases?after=0.4-0). + + +[Unreleased]: https://github.com/Olf0/crypto-sdcard/compare/v1.7.2...HEAD +[1.7.2]: https://github.com/Olf0/crypto-sdcard/compare/v1.7.1...v1.7.2 +[before 1.7.2]: https://github.com/Olf0/crypto-sdcard/releases?after=1.7.2-1.sfos220qcrypto From 628e559f8344729b0001489f0b629735a7bbb09a Mon Sep 17 00:00:00 2001 From: olf Date: Sun, 23 May 2021 00:12:52 +0200 Subject: [PATCH 05/17] Update changelog-template.md --- changelog-template.md | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/changelog-template.md b/changelog-template.md index 2b1526ce..0c93a77c 100644 --- a/changelog-template.md +++ b/changelog-template.md @@ -31,7 +31,6 @@ and this project adheres to [Semantic Versioning v2.0.0](https://semver.org/spec - Croatian translation from [@porx](https://github.com/porx). - Persian translation from [@Hameds](https://github.com/Hameds). - Ukrainian translation from [@osadchyi-s](https://github.com/osadchyi-s). - ### Changed - Start using "changelog" over "change log" since it's the common usage. - Start versioning based on the current English version at 0.3.0 to help @@ -50,7 +49,6 @@ translation authors keep things up-to-date. - Fix typos in Swedish translation. - Improve phrasing in French translation. - Fix phrasing and spelling in German translation. - ### Removed - Section about "changelog" vs "CHANGELOG". @@ -68,7 +66,6 @@ benefit both "open" and "closed" source projects equally. ## [0.1.0] - 2015-10-06 ### Added - Answer "Should you ever rewrite a change log?". - ### Changed - Improve argument against commit logs. - Start following [SemVer](https://semver.org) properly. @@ -78,7 +75,6 @@ benefit both "open" and "closed" source projects equally. - Update year to match in every README example. - Reluctantly stop making fun of Brits only, since most of the world writes dates in a strange way. - ### Fixed - Fix typos in recent README changes. - Update outdated unreleased diff link. @@ -86,10 +82,8 @@ benefit both "open" and "closed" source projects equally. ## [0.0.7] - 2015-02-16 ### Added - Link, and make it obvious that date format is ISO 8601. - ### Changed - Clarified the section on "Is there a standard change log format?". - ### Fixed - Fix Markdown links to tag comparison URL with footnote-style links. @@ -107,12 +101,10 @@ keeping prior to releases. ### Added - Better explanation of the difference between the file ("CHANGELOG") and its function "the change log". - ### Changed - Refer to a "change log" instead of a "CHANGELOG" throughout the site to differentiate between the file and the purpose of the file — the logging of changes. - ### Removed - Remove empty sections from CHANGELOG, they occupy too much space and create too much noise in the file. People will have to assume that the @@ -136,6 +128,7 @@ notable changes. - Good examples and basic guidelines, including proper date formatting. - Counter-examples: "What makes unicorns cry?" + [Unreleased]: https://github.com/olivierlacan/keep-a-changelog/compare/v1.0.0...HEAD [1.0.0]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.3.0...v1.0.0 [0.3.0]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.2.0...v0.3.0 From 74d1e117de1d55db2f6cbd996a67706e5a0a85ac Mon Sep 17 00:00:00 2001 From: olf Date: Sun, 23 May 2021 00:16:09 +0200 Subject: [PATCH 06/17] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd815179..787f24f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ and this project adheres to [Semantic Versioning v2.0.0](https://semver.org/spec ### Removed - foobar -## Versions [before 1.7.2] - 2018-2021 +## Versions [before 1.7.2] (2018 - 2021) See [original thread at TJC](https://together.jolla.com/question/179054/how-to-creating-partitions-on-sd-card-optionally-encrypted/?answer=189813#post-id-189813), the [course version history in the README](https://github.com/Olf0/crypto-sdcard#version-history) and the [detailed version specific reease notes](https://github.com/Olf0/crypto-sdcard/releases?after=0.4-0). From 29b7f6f7d64d9b80ed5913ff459947463b2998c9 Mon Sep 17 00:00:00 2001 From: olf Date: Sun, 23 May 2021 00:16:59 +0200 Subject: [PATCH 07/17] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 787f24f3..434e5b60 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,7 +17,7 @@ and this project adheres to [Semantic Versioning v2.0.0](https://semver.org/spec ## Versions [before 1.7.2] (2018 - 2021) See [original thread at TJC](https://together.jolla.com/question/179054/how-to-creating-partitions-on-sd-card-optionally-encrypted/?answer=189813#post-id-189813), the [course version history in the README](https://github.com/Olf0/crypto-sdcard#version-history) and -the [detailed version specific reease notes](https://github.com/Olf0/crypto-sdcard/releases?after=0.4-0). +the [detailed version specific release notes](https://github.com/Olf0/crypto-sdcard/releases?after=0.4-0). [Unreleased]: https://github.com/Olf0/crypto-sdcard/compare/v1.7.2...HEAD From 6b40c084558863ebbfef196a646f41d12745ee3e Mon Sep 17 00:00:00 2001 From: olf Date: Sun, 23 May 2021 00:19:08 +0200 Subject: [PATCH 08/17] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 434e5b60..dd9a89e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ and this project adheres to [Semantic Versioning v2.0.0](https://semver.org/spec ### Removed - foobar -## Versions [before 1.7.2] (2018 - 2021) +## [Versions before 1.7.2] (2018 - 2021) See [original thread at TJC](https://together.jolla.com/question/179054/how-to-creating-partitions-on-sd-card-optionally-encrypted/?answer=189813#post-id-189813), the [course version history in the README](https://github.com/Olf0/crypto-sdcard#version-history) and the [detailed version specific release notes](https://github.com/Olf0/crypto-sdcard/releases?after=0.4-0). From 9a80cfe2dd12ba79abd425a021d8dd3e0a0a75f0 Mon Sep 17 00:00:00 2001 From: olf Date: Sun, 23 May 2021 00:44:15 +0200 Subject: [PATCH 09/17] Update On-Polkit.md --- On-Polkit.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/On-Polkit.md b/On-Polkit.md index 012222b2..9a32f445 100644 --- a/On-Polkit.md +++ b/On-Polkit.md @@ -31,7 +31,7 @@ As with some other components, SailfishOS tends to lag behind recent Polkit releases, which is not neccesarily a bad thing.
SailfishOS 2.2.0 deployed Polkit 0.104, some later release (before SailfishOS 3.2.1) switched to Polkit 0.105 and SailfishOS 4.0.1 is still deploying Polkit 0.105.
- This looks like aforementioned approach i, although I have not checked which Polkit 0.105 variant the SailfishOS' version is based on or which backport patches it incorporates. + This looks like aforementioned approach 1, although I have not checked which Polkit 0.105 variant the SailfishOS' version is based on or which backport patches it incorporates. #### 1.2 Practically handling Polkit rules From 2b68fe8089c1d1eaf38668edc933ee2ae762554b Mon Sep 17 00:00:00 2001 From: olf Date: Sun, 23 May 2021 01:24:40 +0200 Subject: [PATCH 10/17] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd9a89e6..a63d26a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,4 +22,4 @@ the [detailed version specific release notes](https://github.com/Olf0/crypto-sdc [Unreleased]: https://github.com/Olf0/crypto-sdcard/compare/v1.7.2...HEAD [1.7.2]: https://github.com/Olf0/crypto-sdcard/compare/v1.7.1...v1.7.2 -[before 1.7.2]: https://github.com/Olf0/crypto-sdcard/releases?after=1.7.2-1.sfos220qcrypto +[Versions before 1.7.2]: https://github.com/Olf0/crypto-sdcard/releases?after=1.7.2-1.sfos220qcrypto From 993c0bb3e27174035fbe759fdb92bf5b1a7967d6 Mon Sep 17 00:00:00 2001 From: olf Date: Sun, 23 May 2021 02:41:29 +0200 Subject: [PATCH 11/17] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a63d26a7..a1190fa9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning v2.0.0](https://semver.org/spec ## [Unreleased] ## [1.7.2] - 2021-05-23 +* Sun May 23 2021 olf - 1.7.2 ### Added - foo ### Changed From b1cfd1814e44fcb53a96fe61c369b19c9cd5e177 Mon Sep 17 00:00:00 2001 From: olf Date: Sun, 23 May 2021 02:55:58 +0200 Subject: [PATCH 12/17] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a1190fa9..604ae4a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning v2.0.0](https://semver.org/spec ## [Unreleased] ## [1.7.2] - 2021-05-23 -* Sun May 23 2021 olf - 1.7.2 +* Sun May 23 2021 by olf () - 1.7.2 ### Added - foo ### Changed From 761fca6419153509beeb2f9e1eb075db1b1c5a28 Mon Sep 17 00:00:00 2001 From: olf Date: Sun, 23 May 2021 03:35:49 +0200 Subject: [PATCH 13/17] Update CHANGELOG.md --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 604ae4a3..a63d26a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,6 @@ and this project adheres to [Semantic Versioning v2.0.0](https://semver.org/spec ## [Unreleased] ## [1.7.2] - 2021-05-23 -* Sun May 23 2021 by olf () - 1.7.2 ### Added - foo ### Changed From c36150eb8a6ff99f9ab2376e1a41e82a3047afb9 Mon Sep 17 00:00:00 2001 From: olf Date: Sun, 23 May 2021 04:27:19 +0200 Subject: [PATCH 14/17] PartOf=mount-cryptosd-luks@%i.service does work as intended, but fails on bootup The idea to automatically stop an instance of this unit when the corresponding mounting unit is stopped, works as intended. Manually starting this unit or the corresponding mounting unit, also causes the other one to start, and stopping either one also stops the other one. But for some reason this does not work on boot-up: a. The udev rule starts an instance of this unlocking (opening) unit. b. This unit unlocks (opens) a Cryptsetup device. c. Another udev rule starts an corresponding instance of a mounting unit. d. I suspect that that unit (started in c.) enters temporarily a "failed" state, maybe because `udisks2.service` is not ready yet. e. What can be observed from the Systemd journal, is that Systemd stops the unlocking unit (from a.), which in turn also stops the corresponding mounting unit. Omitting `PartOf=mount-cryptosd-luks@%i.service` "fixes" this. Leaving it as a comment for now. Reference: https://www.freedesktop.org/software/systemd/man/systemd.unit.html#PartOf= --- systemd/system/cryptosd-luks@.service | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/systemd/system/cryptosd-luks@.service b/systemd/system/cryptosd-luks@.service index a09b1894..9a077051 100644 --- a/systemd/system/cryptosd-luks@.service +++ b/systemd/system/cryptosd-luks@.service @@ -4,7 +4,8 @@ Documentation=https://github.com/Olf0/crypto-sdcard DefaultDependencies=no After=systemd-udevd.service systemd-udev-trigger.service dev-disk-by\x2duuid-%i.device systemd-journald.service local-fs.target cryptsetup-pre.target Requisite=dev-disk-by\x2duuid-%i.device -PartOf=mount-cryptosd-luks@%i.service cryptsetup.target +# PartOf=mount-cryptosd-luks@%i.service does work as intended, but fails on bootup. +PartOf=cryptsetup.target Conflicts=umount.target shutdown.target actdead.target factory-test.target Before=umount.target shutdown.target mount-cryptosd-luks@%i.service AssertPathIsDirectory=!/etc/crypto-sdcard/crypto_luks_%I.key From 0ab40fe100c1b893aac1969c05af06504e38c880 Mon Sep 17 00:00:00 2001 From: olf Date: Sun, 23 May 2021 04:28:02 +0200 Subject: [PATCH 15/17] PartOf=mount-cryptosd-plain@%i.service does work as intended, but fails on bootup The idea to automatically stop an instance of this unit when the corresponding mounting unit is stopped, works as intended. Manually starting this unit or the corresponding mounting unit, also causes the other one to start, and stopping either one also stops the other one. But for some reason this does not work on boot-up: a. The udev rule starts an instance of this unlocking (opening) unit. b. This unit unlocks (opens) a Cryptsetup device. c. Another udev rule starts an corresponding instance of a mounting unit. d. I suspect that that unit (started in c.) enters temporarily a "failed" state, maybe because `udisks2.service` is not ready yet. e. What can be observed from the Systemd journal, is that Systemd stops the unlocking unit (from a.), which in turn also stops the corresponding mounting unit. Omitting `PartOf=mount-cryptosd-plain@%i.service` "fixes" this. Leaving it as a comment for now. Reference: https://www.freedesktop.org/software/systemd/man/systemd.unit.html#PartOf= --- systemd/system/cryptosd-plain@.service | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/systemd/system/cryptosd-plain@.service b/systemd/system/cryptosd-plain@.service index 3de3871e..59076c35 100644 --- a/systemd/system/cryptosd-plain@.service +++ b/systemd/system/cryptosd-plain@.service @@ -4,7 +4,8 @@ Documentation=https://github.com/Olf0/crypto-sdcard DefaultDependencies=no After=systemd-udevd.service systemd-udev-trigger.service dev-%i.device systemd-journald.service local-fs.target cryptsetup-pre.target Requisite=dev-%i.device -PartOf=mount-cryptosd-plain@%i.service cryptsetup.target +# PartOf=mount-cryptosd-plain@%i.service does work as intended, but fails on bootup. +PartOf=cryptsetup.target Conflicts=umount.target shutdown.target actdead.target factory-test.target Before=umount.target shutdown.target mount-cryptosd-plain@%i.service AssertPathIsDirectory=!/etc/crypto-sdcard/crypto_plain_%I.key From 377463359fb0fcd487c43582c6503582834d9daf Mon Sep 17 00:00:00 2001 From: olf Date: Sun, 23 May 2021 04:35:31 +0200 Subject: [PATCH 16/17] Post release version increase --- rpm/crypto-sdcard.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm/crypto-sdcard.spec b/rpm/crypto-sdcard.spec index 2b35ab9b..bb1264fa 100644 --- a/rpm/crypto-sdcard.spec +++ b/rpm/crypto-sdcard.spec @@ -1,6 +1,6 @@ Name: crypto-sdcard Summary: Configuration files for unlocking and mounting encrypted SD-cards automatically -Version: 1.7.1 +Version: 1.7.2 # Since v1.3.1, the release version consists of two or three fields, separated by a dot ("."): # - The first field must contain a natural number greater than zero. # This number may be prefixed by one of {alpha,beta,stable}, e.g. "alpha13". From 192e987f7dc2a8ef1cd6fb6155dd0d841cc086b9 Mon Sep 17 00:00:00 2001 From: olf Date: Sun, 23 May 2021 04:38:38 +0200 Subject: [PATCH 17/17] Update crypto-sdcard.spec --- rpm/crypto-sdcard.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm/crypto-sdcard.spec b/rpm/crypto-sdcard.spec index bb1264fa..346d6359 100644 --- a/rpm/crypto-sdcard.spec +++ b/rpm/crypto-sdcard.spec @@ -3,7 +3,7 @@ Summary: Configuration files for unlocking and mounting encrypted SD-cards Version: 1.7.2 # Since v1.3.1, the release version consists of two or three fields, separated by a dot ("."): # - The first field must contain a natural number greater than zero. -# This number may be prefixed by one of {alpha,beta,stable}, e.g. "alpha13". +# This number may be prefixed by one of {alpha,beta,rc,stable}, e.g. "alpha13". # - The second field indicates the minimal required SailfishOS version A.B.C.X in the format "sfosABC"; # the fourth field of a SailfishOS version ("X") is neither depended upon or denoted. # A single, additional word out of {regular,qcrypto} is directly appended, resulting in the whole