Merge pull request #19 from Olf0/sfos220+

Commits for v1.5.1

Author: Olf0

environment/udisks2/mount-sd@.conf

@@ -1,6 +1,6 @@
 Name:          mount-sdcard
 Summary:       Enhanced mounting scripts for SD-cards
-Version:       1.5.0
+Version:       1.5.1
 # Since v1.4.2, 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".
@@ -26,8 +26,9 @@ Source:        https://github.com/Olf0/%{name}/archive/%{version}-%{release}/%{n
 BuildArch:     noarch
 Requires:      systemd
 Requires:      udisks2
-# Better use direct dependencies than indirect ones (here: the line above versus the one below), but
-# ultimately decided to use both in this case:
+# Better use direct dependencies on specific versions than indirect ones (here: the line above
+# versus the one below) in general, but ultimately decided not to do so in this special case
+# (for commonality across release versions):
 Requires:      sailfish-version >= 2.2.0
 # Omit anti-dependency on future, untested SFOS versions, until a known conflict exists:
 Requires:      sailfish-version < 3.0.1
@@ -43,12 +44,10 @@ Requires:      sailfish-version < 3.0.1
 %install
 mkdir -p %{buildroot}%{_sysconfdir}
 cp -R systemd udev %{buildroot}%{_sysconfdir}/
-mkdir -p %{buildroot}%{_sharedstatedir}
-cp -R environment %{buildroot}%{_sharedstatedir}/
 
 %files
 %defattr(-,root,root,-)
 %{_sysconfdir}/systemd/system/mount-sd@.service
 %{_sysconfdir}/udev/rules.d/91-mountsd.rules
-%config(noreplace) %{_sharedstatedir}/environment/udisks2/mount-sd@.conf
+%config %{_sysconfdir}/systemd/system/mount-sd.conf
 

rpm/mount-sdcard.spec

@@ -0,0 +1,16 @@
+# This configuration file is part of the mount-sdcard utility, see https://github.com/Olf0/mount-sdcard/
+# mount-sdcard evaluates configration files at these location in the following order:
+# A file listed lower (i.e., evaluated later) can override settings made by an earlier one.
+# /etc/systemd/system/mount-sd.conf
+# /etc/mount-sdcard/mount-sd.conf
+# Plus at last the device-specific configuration file:
+# /etc/mount-sdcard/mount-sd@<device-name>.conf
+# Do not alter or remove /etc/systemd/system/mount-sd.conf, because it will be redeployed by the next
+# update of mount-sdcard!  Instead alter mount-sdcard's settings by creating one of the configuration
+# files in /etc/mount-sdcard/: I.e., set or reset (per e.g., UDISKS2_MOUNT_OPTIONS="") specific options
+# there.
+# All available option variables are listed here:
+
+UDISKS2_MOUNT_OPTIONS="-o noexec"
+# Mind that udisks2 filters mount options against a whitelist: If not on that list, it refuses to mount.
+

systemd/system/mount-sd.conf

@@ -1,5 +1,5 @@
 [Unit]
-Description=Mount SD-card (%i) with udisks
+Description=Mount /dev/%i per udisks
 After=udisks2.service dev-%i.device start-user-session.service
 Requisite=dev-%i.device
 Requires=udisks2.service
@@ -16,8 +16,9 @@ Before=alien-service-manager.service umount.target
 User=nemo
 Type=oneshot
 RemainAfterExit=yes
-EnvironmentFile=-/var/lib/environment/udisks2/%p@.conf
-EnvironmentFile=-/var/lib/environment/udisks2/%N.conf
+EnvironmentFile=/etc/systemd/system/%p.conf
+EnvironmentFile=-/etc/mount-sdcard/%p.conf
+EnvironmentFile=-/etc/mount-sdcard/%N.conf
 ExecStart=/usr/bin/udisksctl mount $UDISKS2_MOUNT_OPTIONS -b /dev/%i
 ExecStop=/usr/bin/udisksctl unmount -b /dev/%i
 ExecStopPost=/bin/umount -vrq /dev/%i