Merge pull request #144 from Olf0/master

Missed commits for v1.4.1

README.md

@@ -52,7 +52,7 @@ Thus *crypto-sdcard* solely protects "data at rest" on SD-cards and other remova
   "Key"-file path and names are now:
   * For Cryptsetup LUKS: `/etc/crypto-sdcard/crypto_luks_<UUID>.key` (since v0.3)
   * For Cryptsetup "plain": `/etc/crypto-sdcard/crypto_plain_<device-name>.key` (since v0.5-7)
-  * A specific `<UUID>` can be obtained by executing `blkid -c /dev/null -s UUID -o value /dev/<device-name>` with e.g. `mmcblk1p2` as `<device-name>`.
+  * A specific `<UUID>` can be obtained by executing `blkid -s UUID -o value /dev/<device-name>` with e.g. `mmcblk1p2` as `<device-name>`.
 * v0.5<br />
   Although the installed configuration files are unaltered since v0.4-3, the spec-file ("RPM packaging") changes have been significant, so it ultimately earns an increased version number.
 * v0.4<br />

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.0
+Version:       1.4.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".
@@ -20,10 +20,10 @@ License:       MIT
 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):
-# It only accepts a GIF or XPM file (a path is stripped to its basename) in the SOURCE directory
-# (but not in the tarball)!  Successfully tested GIF89a and XPMv3, but an XPM icon results in
-# bad visual quality and large file size.
-# Hence only to be used, when the file is put there:
+# It only accepts a GIF or XPM file (a path is stripped to its basename) in the SOURCES directory
+# (but not inside a tarball there)!  Successfully tested GIF89a and XPMv3, but an XPM icon results
+# in bad visual quality and large file size.
+# Hence only to be used, when the file (or a symlink to it) is put there:
 #Icon:          smartmedia_mount.256x256.gif
 BuildArch:     noarch
 Requires:      systemd

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

@@ -17,11 +17,6 @@ Before=alien-service-manager.service
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-# "udisksctl mount" (below) sometimes fails when issued right after
-# "udisksd" (per "udisks2.service") has finished starting, as the
-# udisks object for an encrypted partition has not been created yet.
-# Hence one might give udisksd a second to settle:
-# ExecStartPre=/bin/sleep 1
 EnvironmentFile=-/var/lib/environment/udisks2/%[email protected]
 EnvironmentFile=-/var/lib/environment/udisks2/%p@%I.conf
 ExecStart=/usr/bin/udisksctl-user mount $UDISKS2_MOUNT_OPTIONS -b /dev/mapper/%I

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

@@ -17,11 +17,6 @@ Before=alien-service-manager.service
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-# "udisksctl mount" (below) sometimes fails when issued right after
-# "udisksd" (per "udisks2.service") has finished starting, as the
-# udisks object for an encrypted partition has not been created yet.
-# Hence one might give udisksd a second to settle:
-# ExecStartPre=/bin/sleep 1
 EnvironmentFile=-/var/lib/environment/udisks2/%[email protected]
 EnvironmentFile=-/var/lib/environment/udisks2/%p@%I.conf
 ExecStart=/usr/bin/udisksctl-user mount $UDISKS2_MOUNT_OPTIONS -b /dev/mapper/%I