From b5bd9b6c6f35c2da59ea119a7506d8dcfa25319f Mon Sep 17 00:00:00 2001 From: olf Date: Tue, 16 Mar 2021 13:45:24 +0100 Subject: [PATCH 1/3] LGPL-2.1-only --- 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 9e69f0ba..c5fc0ea8 100644 --- a/rpm/crypto-sdcard.spec +++ b/rpm/crypto-sdcard.spec @@ -16,7 +16,7 @@ Group: System/Base Distribution: SailfishOS Vendor: olf Packager: olf -License: MIT +License: LGPL-2.1-only URL: https://github.com/Olf0/%{name} Source: https://github.com/Olf0/%{name}/archive/%{version}-%{release}/%{name}-%{version}-%{release}.tar.gz # rpmbuild (as of v4.14.1) handles the Icon tag awkwardly and in contrast to the Source tag(s): From f8502302b4cb2c06ee3dfd6dee9cb84a07dbb20b Mon Sep 17 00:00:00 2001 From: olf Date: Tue, 16 Mar 2021 14:20:41 +0100 Subject: [PATCH 2/3] EnvironmentFile=-/var/lib/environment/udisks2/%N.conf --- systemd/system/mount-cryptosd-luks@.service | 1 + 1 file changed, 1 insertion(+) diff --git a/systemd/system/mount-cryptosd-luks@.service b/systemd/system/mount-cryptosd-luks@.service index 9748eebf..6c024636 100644 --- a/systemd/system/mount-cryptosd-luks@.service +++ b/systemd/system/mount-cryptosd-luks@.service @@ -18,6 +18,7 @@ Before=alien-service-manager.service umount.target Type=oneshot RemainAfterExit=yes EnvironmentFile=-/var/lib/environment/udisks2/%p@.conf +EnvironmentFile=-/var/lib/environment/udisks2/%N.conf EnvironmentFile=-/var/lib/environment/udisks2/%p@%I.conf ExecStart=/usr/bin/udisksctl-user mount $UDISKS2_MOUNT_OPTIONS -b /dev/mapper/%I ExecStop=/usr/bin/udisksctl unmount -b /dev/mapper/%I From a51c4e08cd9ffbf99449504f7b8fc6cd0ff22212 Mon Sep 17 00:00:00 2001 From: olf Date: Tue, 16 Mar 2021 14:21:23 +0100 Subject: [PATCH 3/3] EnvironmentFile=-/var/lib/environment/udisks2/%N.conf --- systemd/system/mount-cryptosd-plain@.service | 1 + 1 file changed, 1 insertion(+) diff --git a/systemd/system/mount-cryptosd-plain@.service b/systemd/system/mount-cryptosd-plain@.service index d9e0b7d1..66f785b3 100644 --- a/systemd/system/mount-cryptosd-plain@.service +++ b/systemd/system/mount-cryptosd-plain@.service @@ -18,6 +18,7 @@ Before=alien-service-manager.service umount.target Type=oneshot RemainAfterExit=yes EnvironmentFile=-/var/lib/environment/udisks2/%p@.conf +EnvironmentFile=-/var/lib/environment/udisks2/%N.conf EnvironmentFile=-/var/lib/environment/udisks2/%p@%I.conf ExecStart=/usr/bin/udisksctl-user mount $UDISKS2_MOUNT_OPTIONS -b /dev/mapper/%I ExecStop=/usr/bin/udisksctl unmount -b /dev/mapper/%I