diff --git a/rpm/mount-sdcard.spec b/rpm/mount-sdcard.spec index de8872d..1cd431c 100644 --- a/rpm/mount-sdcard.spec +++ b/rpm/mount-sdcard.spec @@ -1,4 +1,4 @@ -%global branch sfosABC +%global branch sfos321 Name: mount-sdcard Summary: Enhanced mounting scripts for media as SD-cards Version: 1.8.2 @@ -46,7 +46,7 @@ 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.2.1 # Counter-dependency (necessary for the multiple release branch scheme chosen): Requires: sailfish-version < 3.4.0 diff --git a/udev/rules.d/91-mountsd.rules b/udev/rules.d/91-mountsd.rules index e214fa8..9a64892 100644 --- 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"