Merge pull request #50 from Olf0/301+

Prepare v1.8.1
Olf0 · Jun 2, 2021 · 2754593 · 2754593
2 parents 8af4b85 + 63e82a2
commit 2754593
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/rpm/mount-sdcard.spec b/rpm/mount-sdcard.spec
@@ -1,6 +1,6 @@
 Name:          mount-sdcard
 Summary:       Enhanced mounting scripts for SD-cards
-Version:       1.8.0
+Version:       1.8.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,rc,stable}, e.g. "alpha13".
@@ -30,7 +30,7 @@ Requires:      udisks2
 # 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.0.1
-# Omit anti-dependency on future, untested SFOS versions, until a known conflict exists:
+# Counter-dependency (necessary for the multiple release branch scheme chosen):
 Requires:      sailfish-version < 3.2.1
 
 %description

diff --git a/udev/rules.d/91-mountsd.rules b/udev/rules.d/91-mountsd.rules
@@ -11,7 +11,6 @@
 # Is something like KERNEL=="mmcblk[1-9]*|sd*|sr*", SUBSYSTEMS=="usb", ATTR{removable}="1" possible and reasonable (means only "removable *media*"?) ?  Or without restricting it to USB-attached devices / partitions?
 
 SUBSYSTEM!="block", GOTO="mountsd_end"
-KERNEL!="mmcblk[1-9]*|sd*|sr*", GOTO="mountsd_end"
 
 # Ignore the additions / changes by Jolla per
 # https://git.sailfishos.org/mer-core/udisks2/blob/master/rpm/0005-Add-udev-rule-for-the-sda-drives.patch