[systemd-commits] 2 commits - rules/60-persistent-storage.rules

[Kay Sievers]

 rules/60-persistent-storage.rules |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit afa91a72315b7becfe753dcba1f337578f15caff
Author: Mantas Mikulėnas <grawity at gmail.com>
Date:   Tue Mar 17 18:00:24 2015 +0200

    rules: storage - support MemoryStick (non-Pro) cards
    
    These are handled by a different driver than MemoryStick Pro.

diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules
index 341ef9c..3f803ce 100644
--- a/rules/60-persistent-storage.rules
+++ b/rules/60-persistent-storage.rules
@@ -6,7 +6,7 @@
 ACTION=="remove", GOTO="persistent_storage_end"
 
 SUBSYSTEM!="block", GOTO="persistent_storage_end"
-KERNEL!="loop*|mmcblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*", GOTO="persistent_storage_end"
+KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*", GOTO="persistent_storage_end"
 
 # ignore partitions that span the entire disk
 TEST=="whole_disk", GOTO="persistent_storage_end"
@@ -45,9 +45,9 @@ KERNEL=="mmcblk[0-9]", SUBSYSTEMS=="mmc", ATTRS{name}=="?*", ATTRS{serial}=="?*"
 KERNEL=="mmcblk[0-9]p[0-9]", ENV{ID_NAME}=="?*", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/mmc-$env{ID_NAME}_$env{ID_SERIAL}-part%n"
 
 # Memstick
-KERNEL=="mspblk[0-9]", SUBSYSTEMS=="memstick", ATTRS{name}=="?*", ATTRS{serial}=="?*", \
+KERNEL=="msblk[0-9]|mspblk[0-9]", SUBSYSTEMS=="memstick", ATTRS{name}=="?*", ATTRS{serial}=="?*", \
   ENV{ID_NAME}="$attr{name}", ENV{ID_SERIAL}="$attr{serial}", SYMLINK+="disk/by-id/memstick-$env{ID_NAME}_$env{ID_SERIAL}"
-KERNEL=="mspblk[0-9]p[0-9]", ENV{ID_NAME}=="?*", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/memstick-$env{ID_NAME}_$env{ID_SERIAL}-part%n"
+KERNEL=="msblk[0-9]p[0-9]|mspblk[0-9]p[0-9]", ENV{ID_NAME}=="?*", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/memstick-$env{ID_NAME}_$env{ID_SERIAL}-part%n"
 
 # by-path
 ENV{DEVTYPE}=="disk", DEVPATH!="*/virtual/*", IMPORT{builtin}="path_id"

commit 174470fbf1cba7e812111e19b568fab49f5966aa
Author: Kay Sievers <kay at vrfy.org>
Date:   Tue Mar 24 23:28:25 2015 +0100

    rules: storage - whitelist partitioned MS & MMC devices
    
    On Mon, Mar 23, 2015 at 8:55 AM, Mantas Mikulėnas <grawity at gmail.com> wrote:
    > On Tue, Mar 17, 2015 at 11:50 PM, Kay Sievers <kay at vrfy.org> wrote:
    >> On Tue, Mar 17, 2015 at 5:00 PM, Mantas Mikulėnas <grawity at gmail.com>
    >> wrote:
    >> > Accidentally dropped in 1aff20687f4868575.
    >> > ---
    >> >  rules/60-persistent-storage.rules | 2 +-
    >> >  1 file changed, 1 insertion(+), 1 deletion(-)
    >>
    >> > +KERNEL!="loop*|mmcblk[0-9]*|mspblk[0-9]*|nvme*|sd*|sr*|vd*",
    >> > GOTO="persistent_storage_end"
    >>
    >> We can't do that, we need to ignore the mmc*rpmb devices:
    >>
    >> http://cgit.freedesktop.org/systemd/systemd/commit/?id=b87b01cf83947f467f3c46d9831cd67955fc46b9
    >>
    >> Maybe "mmcblk*[0-9]" will work?
    >
    > Yeah, that would probably work (the names are like mmcblk0p1 etc.)

diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules
index 1124050..341ef9c 100644
--- a/rules/60-persistent-storage.rules
+++ b/rules/60-persistent-storage.rules
@@ -6,7 +6,7 @@
 ACTION=="remove", GOTO="persistent_storage_end"
 
 SUBSYSTEM!="block", GOTO="persistent_storage_end"
-KERNEL!="loop*|mmcblk[0-9]|mspblk[0-9]|nvme*|sd*|sr*|vd*", GOTO="persistent_storage_end"
+KERNEL!="loop*|mmcblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*", GOTO="persistent_storage_end"
 
 # ignore partitions that span the entire disk
 TEST=="whole_disk", GOTO="persistent_storage_end"