Merge branch 'unmount-sdcard-as-root' into 'master'

Update 0004-Introduce-mount-sd-service-that-is-executed-as-user.patch to cleanly unmount

See merge request mer-core/udisks2!29

rpm/0004-Introduce-mount-sd-service-that-is-executed-as-user.patch

@@ -45,18 +45,19 @@ new file mode 100644
 index 00000000..c1aa7de3
 --- /dev/null
 +++ b/data/mount-sd@.service
-@@ -0,0 +1,11 @@
+@@ -0,0 +1,12 @@
 +[Unit]
 +Description=Handle udisks sd mount
-+After=dev-%i.device start-user-session.service
-+BindsTo=dev-%i.device
++After=udisks2.service dev-%i.device start-user-session.service
++Requisite=dev-%i.device
++Requires=udisks2.service
 +Conflicts=rescue.target actdead.target factory-test.target
 +
 +[Service]
 +Type=oneshot
 +RemainAfterExit=yes
 +ExecStart=/usr/bin/udisksctl-user mount -b /dev/%i
-+ExecStop=-/usr/bin/udisksctl-user unmount -b /dev/%i
++ExecStop=/usr/bin/udisksctl unmount -b /dev/%i
 diff --git a/tools/Makefile.am b/tools/Makefile.am
 index 2118e6db..ee8fd06f 100644
 --- a/tools/Makefile.am

rpm/0013-Pass-extra-mount-options-to-mount-sd-service.patch

@@ -11,14 +11,14 @@ diff --git a/data/mount-sd@.service b/data/mount-sd@.service
 index c1aa7de3..22433391 100644
 --- a/data/mount-sd@.service
 +++ b/data/mount-sd@.service
-@@ -7,5 +7,6 @@ Conflicts=rescue.target actdead.target factory-test.target
+@@ -8,5 +8,6 @@ Conflicts=rescue.target actdead.target factory-test.target
  [Service]
  Type=oneshot
  RemainAfterExit=yes
 -ExecStart=/usr/bin/udisksctl-user mount -b /dev/%i
 +EnvironmentFile=-/var/lib/environment/udisks2/*.conf
 +ExecStart=/usr/bin/udisksctl-user mount $UDISKS2_MOUNT_OPTIONS -b /dev/%i
- ExecStop=-/usr/bin/udisksctl-user unmount -b /dev/%i
+ ExecStop=/usr/bin/udisksctl unmount -b /dev/%i
 -- 
 2.25.1