Merge pull request #2 from Olf0/sfos-3-2

SFOS3.2.1

Author: Olf0

README.md

@@ -16,7 +16,7 @@ Notes:
 * These configuration files do not alter, replace or delete any extant files.
 * Minimal SailfishOS version supported by *mount-sdcard* is 2.2.0.
 * Since *mount-sdcard 1.0-4* at least SailfishOS 3.0.1 is required.
+* Since *mount-sdcard 1.1-1* at least [SailfishOS 3.2.1](https://github.com/Olf0/mount-sdcard/pull/2) is required.
 * Support of partitions and whole devices (as Jolla's original versions do).
 * Support for (µ)SD-cards and USB-attached storage (if supported by device hardware and Operating System).
 * An RPM built for SailfishOS is available at [OpenRepos](https://openrepos.net/content/olf/mount-sdcard).
-

rpm/mount-sdcard.spec

@@ -1,7 +1,7 @@
 Name:          mount-sdcard
 Summary:       Enhanced mounting scripts for SD-cards
-Version:       1.0
-Release:       4
+Version:       1.1
+Release:       1
 Group:         System/Base
 Distribution:  SailfishOS
 Vendor:        olf
@@ -12,9 +12,9 @@ Source:        https://github.com/Olf0/%{name}/archive/%{version}-%{release}/%{n
 BuildArch:     noarch
 Requires:      systemd
 Requires:      udisks2
-Requires:      sailfish-version >= 3.0.1
+Requires:      sailfish-version >= 3.2.1
 # Omit anti-dependency on future, untested SFOS versions, until a known conflict exists:
-# Requires:     sailfish-version < 3.2.0
+# Requires:     sailfish-version < 3.9.9
 
 %description
 %{summary}

systemd/system/mount-sd@.service

@@ -1,6 +1,6 @@
 [Unit]
 Description=Mount SD-card (%i) with udisks
-After=udisks2.service dev-%i.device
+After=udisks2.service dev-%i.device start-user-session.service
 BindsTo=udisks2.service dev-%i.device
 Conflicts=rescue.target actdead.target factory-test.target
 # Ensure that this Unit is processed before alien-service-manager
@@ -10,14 +10,13 @@ Conflicts=rescue.target actdead.target factory-test.target
 Before=alien-service-manager.service
 
 [Service]
-User=nemo
 Type=oneshot
 RemainAfterExit=yes
 # As "udisksctl mount" (below) may fail when issued right after
 # "udisksd" (per "udisks2.service") has finished starting, because
 # the udisks object for a partition has not been created yet, one
 # may give udisksd a second to settle:
 # ExecStartPre=/bin/sleep 1
-ExecStart=/usr/bin/udisksctl mount -b /dev/%i
-ExecStop=/usr/bin/udisksctl unmount -b /dev/%i
+ExecStart=/usr/bin/udisksctl-user mount -b /dev/%i
+ExecStop=/usr/bin/udisksctl-user unmount -b /dev/%i