Merge pull request #150 from Olf0/sfos220qcrypto+

Commits for v1.4.3

rpm/crypto-sdcard.spec

@@ -1,6 +1,6 @@
 Name:          crypto-sdcard
 Summary:       Configuration files for unlocking and mounting encrypted SD-cards automatically
-Version:       1.4.2
+Version:       1.4.3
 # 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".

systemd/system/cryptosd-luks@.service

@@ -1,9 +1,13 @@
 [Unit]
 Description=Open DM-Crypt LUKS on SD-card %I
 Documentation=https://github.com/Olf0/crypto-sdcard
-After=systemd-udevd.service dev-%i.device
-BindsTo=dev-%i.device
-Conflicts=umount.target actdead.target factory-test.target
+DefaultDependencies=no
+After=sysinit.target dev-%i.device
+Requisite=dev-%i.device
+Requires=sysinit.target
+Conflicts=umount.target shutdown.target actdead.target factory-test.target
+Before=umount.target shutdown.target mount-cryptosd-luks@%i.service
+IgnoreOnIsolate=true
 AssertFileNotEmpty=/etc/crypto-sdcard/%I.key
 
 [Service]

systemd/system/cryptosd-plain@.service

@@ -1,9 +1,13 @@
 [Unit]
 Description=Open DM-Crypt "plain" on SD-card %I
 Documentation=https://github.com/Olf0/crypto-sdcard
-After=systemd-udevd.service dev-%i.device
-BindsTo=dev-%i.device
-Conflicts=umount.target actdead.target factory-test.target
+DefaultDependencies=no
+After=sysinit.target dev-%i.device
+Requisite=dev-%i.device
+Requires=sysinit.target
+Conflicts=umount.target shutdown.target actdead.target factory-test.target
+Before=umount.target shutdown.target mount-cryptosd-plain@%i.service
+IgnoreOnIsolate=true
 AssertFileNotEmpty=/etc/crypto-sdcard/%I.key
 
 [Service]

systemd/system/mount-cryptosd-luks@.service

@@ -2,8 +2,8 @@
 Description=Mount LUKS encrypted SD-card (%I) with udisks
 Documentation=https://github.com/Olf0/crypto-sdcard
 After=udisks2.service cryptosd-luks@%i.service dev-mapper-%i.device start-user-session.service
-BindsTo=dev-mapper-%i.device cryptosd-luks@%i.service
-Requires=udisks2.service
+Requisite=dev-mapper-%i.device
+Requires=udisks2.service cryptosd-luks@%i.service
 # Allow for rescue.target and conflict with umount.target (see
 # man 7 systemd.special; needed explicitly for the new ExecStopPost
 # statement as this a mounting unit, though not a mount unit):
@@ -12,7 +12,7 @@ Conflicts=umount.target actdead.target factory-test.target
 # is started (and even more importantly that it is shut down, *after*
 # alien-service-manager is shut down), to allow for e.g. (and more),
 # android_storage on encrypted SD-card:
-Before=alien-service-manager.service
+Before=alien-service-manager.service umount.target
 
 [Service]
 User=nemo
@@ -22,5 +22,5 @@ EnvironmentFile=-/var/lib/environment/udisks2/%[email protected]
 EnvironmentFile=-/var/lib/environment/udisks2/%p@%I.conf
 ExecStart=/usr/bin/udisksctl mount $UDISKS2_MOUNT_OPTIONS -b /dev/mapper/%I
 ExecStop=/usr/bin/udisksctl unmount -b /dev/mapper/%I
-ExecStopPost=/bin/umount -vrq /dev/%I
+ExecStopPost=/bin/umount -vrq /dev/mapper/%I
 

systemd/system/mount-cryptosd-plain@.service

@@ -2,8 +2,8 @@
 Description=Mount "plain" encrypted SD-card (%I) with udisks
 Documentation=https://github.com/Olf0/crypto-sdcard
 After=udisks2.service cryptosd-plain@%i.service dev-mapper-%i.device start-user-session.service
-BindsTo=dev-mapper-%i.device cryptosd-plain@%i.service
-Requires=udisks2.service
+Requisite=dev-mapper-%i.device
+Requires=udisks2.service cryptosd-plain@%i.service
 # Allow for rescue.target and conflict with umount.target (see
 # man 7 systemd.special; needed explicitly for the new ExecStopPost
 # statement as this a mounting unit, though not a mount unit):
@@ -12,7 +12,7 @@ Conflicts=umount.target actdead.target factory-test.target
 # is started (and even more importantly that it is shut down, *after*
 # alien-service-manager is shut down), to allow for e.g. (and more),
 # android_storage on encrypted SD-card:
-Before=alien-service-manager.service
+Before=alien-service-manager.service umount.target
 
 [Service]
 User=nemo
@@ -22,5 +22,5 @@ EnvironmentFile=-/var/lib/environment/udisks2/%[email protected]
 EnvironmentFile=-/var/lib/environment/udisks2/%p@%I.conf
 ExecStart=/usr/bin/udisksctl mount $UDISKS2_MOUNT_OPTIONS -b /dev/mapper/%I
 ExecStop=/usr/bin/udisksctl unmount -b /dev/mapper/%I
-ExecStopPost=/bin/umount -vrq /dev/%I
+ExecStopPost=/bin/umount -vrq /dev/mapper/%I