Merge branch 'sfos301' into 301+

Olf0 · Jun 2, 2021 · 63e82a2 · 63e82a2
2 parents 6c22c0d + 8af4b85
commit 63e82a2
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 19 deletions.
diff --git a/polkit-1/localauthority/50-local.d/61-mountsd.pkla b/polkit-1/localauthority/50-local.d/61-mountsd.pkla
@@ -6,21 +6,21 @@ ResultInactive=yes
 ResultActive=yes
 
 [Primary user(s): udisks2.manage-md-raid]
-Identity=unix-group:media_rw
+Identity=unix-group:system
 Action=org.freedesktop.udisks2.manage-md-raid
 ResultAny=auth_self
 ResultInactive=auth_self
 ResultActive=auth_self_keep
 
 [Root users & primary user(s): udisks2.power-off-drive*, except for *-system]
-Identity=unix-group:root;unix-group:media_rw
+Identity=unix-group:root;unix-group:system
 Action=org.freedesktop.udisks2.power-off-drive;org.freedesktop.udisks2.power-off-drive-other-seat
 ResultAny=yes
 ResultInactive=yes
 ResultActive=yes
 
 [Root users & primary user(s): udisks2.eject-media*, except for *-system]
-Identity=unix-group:root;unix-group:media_rw
+Identity=unix-group:root;unix-group:system
 Action=org.freedesktop.udisks2.eject-media;org.freedesktop.udisks2.eject-media-other-seat
 ResultAny=auth_self
 ResultInactive=auth_self
@@ -34,21 +34,21 @@ ResultInactive=auth_self
 ResultActive=yes
 
 [Primary user(s): udisks2.modify-device]
-Identity=unix-group:media_rw
+Identity=unix-group:system
 Action=org.freedesktop.udisks2.modify-device
 ResultAny=auth_self
 ResultInactive=auth_self
 ResultActive=auth_self_keep
 
 [Root users & primary user(s): udisks2.modify-device-system & udisks2.modify-device-other-seat]
-Identity=unix-group:root;unix-group:media_rw
+Identity=unix-group:root;unix-group:system
 Action=org.freedesktop.udisks2.modify-device-system;org.freedesktop.udisks2.modify-device-other-seat
 ResultAny=auth_self
 ResultInactive=auth_self
 ResultActive=auth_self_keep
 
 [Root users & primary user(s): udisks2.rescan]
-Identity=unix-group:root;unix-group:media_rw
+Identity=unix-group:root;unix-group:system
 Action=org.freedesktop.udisks2.rescan
 ResultAny=yes
 ResultInactive=yes
@@ -62,14 +62,14 @@ ResultInactive=yes
 ResultActive=yes
 
 [Primary user(s): udisks2.open-device]
-Identity=unix-group:media_rw
+Identity=unix-group:system
 Action=org.freedesktop.udisks2.open-device
 ResultAny=auth_self
 ResultInactive=auth_self
 ResultActive=yes
 
 [Root users & primary user(s): udisks2.open-device-system]
-Identity=unix-group:root;unix-group:media_rw
+Identity=unix-group:root;unix-group:system
 Action=org.freedesktop.udisks2.open-device-system
 ResultAny=auth_self
 ResultInactive=auth_self
@@ -90,7 +90,7 @@ ResultInactive=auth_admin
 ResultActive=auth_admin_keep
 
 [Root users & primary user(s): <various, harmless device settings>]
-Identity=unix-group:root;unix-group:media_rw
+Identity=unix-group:root;unix-group:system
 Action=org.freedesktop.udisks2.modify-drive-settings;org.freedesktop.udisks2.ata-smart-enable-disable;org.freedesktop.udisks2.ata-smart-update
 ResultAny=yes
 ResultInactive=yes
@@ -104,21 +104,21 @@ ResultInactive=yes
 ResultActive=yes
 
 [Primary user(s): udisks2.ata-smart-simulate & udisks2.ata-smart-selftest]
-Identity=unix-group:media_rw
+Identity=unix-group:system
 Action=org.freedesktop.udisks2.ata-smart-simulate;org.freedesktop.udisks2.ata-smart-selftest
 ResultAny=auth_self
 ResultInactive=auth_self
 ResultActive=auth_self_keep
 
 [Root users & primary user(s): <device power-save settings>, except for *-system]
-Identity=unix-group:root;unix-group:media_rw
+Identity=unix-group:root;unix-group:system
 Action=org.freedesktop.udisks2.ata-check-power;org.freedesktop.udisks2.ata-standby;org.freedesktop.udisks2.ata-standby-other-seat
 ResultAny=yes
 ResultInactive=yes
 ResultActive=yes
 
 [Root users & primary user(s): udisks2.cancel-job*]
-Identity=unix-group:root;unix-group:media_rw
+Identity=unix-group:root;unix-group:system
 Action=org.freedesktop.udisks2.cancel-job;org.freedesktop.udisks2.cancel-job-other-user
 ResultAny=yes
 ResultInactive=yes

diff --git a/rpm/mount-sdcard.spec b/rpm/mount-sdcard.spec
@@ -9,7 +9,7 @@ Version:       1.8.1
 # - An optional third field might be used by downstream packagers, who alter the package but want to
 #   retain the exact version number.  It shall consist of the packager's name appended with a natural 
 #   number greater than zero, e.g "joe8".
-Release:       1.sfosABC
+Release:       1.sfos301
 Group:         System/Base
 Distribution:  SailfishOS
 Vendor:        olf
@@ -29,9 +29,9 @@ Requires:      udisks2
 # 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 >= 3.4.0
+Requires:      sailfish-version >= 3.0.1
 # Counter-dependency (necessary for the multiple release branch scheme chosen):
-Requires:      sailfish-version < 3.4.0
+Requires:      sailfish-version < 3.2.1
 
 %description
 %{summary}

diff --git a/systemd/system/[email protected] b/systemd/system/[email protected]
@@ -14,12 +14,13 @@ Conflicts=umount.target rescue.target actdead.target factory-test.target
 Before=alien-service-manager.service umount.target
 
 [Service]
+User=nemo
 Type=oneshot
 RemainAfterExit=yes
 EnvironmentFile=/etc/systemd/system/%p.conf
 EnvironmentFile=-/etc/mount-sdcard/%p.conf
 EnvironmentFile=-/etc/mount-sdcard/%N.conf
-ExecStart=/usr/bin/udisksctl-user mount $UDISKS2_MOUNT_OPTIONS -b /dev/%i
+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
 
diff --git a/udev/rules.d/91-mountsd.rules b/udev/rules.d/91-mountsd.rules
@@ -25,10 +25,10 @@ KERNEL=="mmcblk[1-9]*", ATTR{power/control}=="on", ENV{UDISKS_CAN_POWER_OFF}="1"
 SUBSYSTEMS=="usb", KERNEL=="mmcblk0*|sd*|sr*", ATTR{power/control}=="on", ENV{UDISKS_CAN_POWER_OFF}="1"
 
 # Match ENV{ID_FS_USAGE}=="filesystem" for all selected devices
-KERNEL=="mmcblk[1-9]*", ENV{ID_FS_USAGE}=="filesystem", ACTION=="add|change", ENV{UDISKS_SYSTEM}="0", ENV{UDISKS_AUTO}="0", ENV{UDISKS_NAME}="mountsd_dev-%k", MODE="0660", ENV{MOUNTSD_ACTIVATED}="1", TAG+="systemd", ENV{SYSTEMD_WANTS}="'mount-sd@%k.service'"
-SUBSYSTEMS=="usb", KERNEL=="mmcblk0*|sd*|sr*", ENV{ID_FS_USAGE}=="filesystem", ACTION=="add|change", ENV{UDISKS_SYSTEM}="0", ENV{UDISKS_AUTO}="0", ENV{UDISKS_NAME}="mountsd_dev-%k", MODE="0660", ENV{MOUNTSD_ACTIVATED}="1", TAG+="systemd", ENV{SYSTEMD_WANTS}="'mount-sd@%k.service'"
+KERNEL=="mmcblk[1-9]*", ENV{ID_FS_USAGE}=="filesystem", ACTION=="add|change", ENV{UDISKS_SYSTEM}="0", ENV{UDISKS_AUTO}="0", ENV{UDISKS_NAME}="mountsd_dev-%k", MODE="0660", ENV{MOUNTSD_ACTIVATED}="1", TAG+="systemd", ENV{SYSTEMD_WANTS}="mount-sd@%k.service"
+SUBSYSTEMS=="usb", KERNEL=="mmcblk0*|sd*|sr*", ENV{ID_FS_USAGE}=="filesystem", ACTION=="add|change", ENV{UDISKS_SYSTEM}="0", ENV{UDISKS_AUTO}="0", ENV{UDISKS_NAME}="mountsd_dev-%k", MODE="0660", ENV{MOUNTSD_ACTIVATED}="1", TAG+="systemd", ENV{SYSTEMD_WANTS}="mount-sd@%k.service"
 # When above detected and assigned devices are removed
-ENV{MOUNTSD_ACTIVATED}=="1", ACTION=="remove", ENV{MOUNTSD_ACTIVATED}="0", ENV{UDISKS_NAME}="mountsd_removed", ENV{SYSTEMD_WANTS}="", ENV{SYSTEMD_USER_WANTS}="", RUN{program}+="/usr/bin/systemctl stop mount-sd@%k.service"
+ENV{MOUNTSD_ACTIVATED}=="1", ACTION=="remove", ENV{MOUNTSD_ACTIVATED}="0", ENV{UDISKS_NAME}="mountsd_removed", ENV{SYSTEMD_WANTS}="", ENV{SYSTEMD_USER_WANTS}="", RUN{program}+="/bin/systemctl stop mount-sd@%k.service"
 
 LABEL="mountsd_end"