Merge pull request #217 from Olf0/qcrypto

Fixup for v1.6.1
Olf0 · Apr 7, 2021 · 5141f48 · 5141f48
2 parents 7e96023 + f22df05
commit 5141f48
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/systemd/system/cryptosd-luks@.service b/systemd/system/cryptosd-luks@.service
@@ -2,8 +2,9 @@
 Description=Open %I per cryptsetup
 Documentation=https://github.com/Olf0/crypto-sdcard
 DefaultDependencies=no
-After=systemd-udevd.service systemd-udev-trigger.service dev-disk-by\x2duuid-%i.device
+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
 Conflicts=umount.target shutdown.target actdead.target factory-test.target
 Before=umount.target shutdown.target mount-cryptosd-luks@%i.service
 # That would allow this unit to keep on running, when switching to e.g., rescue.target

diff --git a/systemd/system/cryptosd-plain@.service b/systemd/system/cryptosd-plain@.service
@@ -2,8 +2,9 @@
 Description=Open %I per cryptsetup
 Documentation=https://github.com/Olf0/crypto-sdcard
 DefaultDependencies=no
-After=systemd-udevd.service systemd-udev-trigger.service dev-%i.device
+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
 Conflicts=umount.target shutdown.target actdead.target factory-test.target
 Before=umount.target shutdown.target mount-cryptosd-plain@%i.service
 # That would allow this unit to keep on running, when switching to e.g., rescue.target