[systemd-commits] 2 commits - rules/60-block.rules

[Tom Gundersen]

 rules/60-block.rules |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b50063512d4be4d29e0ca5d28f66bc1121861e3b
Author: Tom Gundersen <teg at jklm.no>
Date:   Fri May 29 20:55:39 2015 +0200

    rules: restore block watch after CHANGE events
    
    When processing an event, the watch is disabled, make sure it is restorted after
    a CHANGE event has been processed.

diff --git a/rules/60-block.rules b/rules/60-block.rules
index cfd5010..a69d648 100644
--- a/rules/60-block.rules
+++ b/rules/60-block.rules
@@ -8,4 +8,4 @@ ACTION=="add", SUBSYSTEM=="module", KERNEL=="block", ATTR{parameters/events_dfl_
 ACTION=="change", SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST=="block", ATTR{block/*/uevent}="change"
 
 # watch metadata changes, caused by tools closing the device node which was opened for writing
-ACTION=="add", SUBSYSTEM=="block", KERNEL=="loop*|nvme*|sd*|vd*", OPTIONS+="watch"
+ACTION!="remove", SUBSYSTEM=="block", KERNEL=="loop*|nvme*|sd*|vd*", OPTIONS+="watch"

commit f07689517e3715d03590e779841647aed0cd2ba7
Author: Tom Gundersen <teg at jklm.no>
Date:   Fri May 29 19:59:24 2015 +0200

    rules: fix typo in block watch rule
    
    The intention was to turn this rule from using a blacklist to a whitelist, but
    there was a stray '!'.

diff --git a/rules/60-block.rules b/rules/60-block.rules
index de41499..cfd5010 100644
--- a/rules/60-block.rules
+++ b/rules/60-block.rules
@@ -8,4 +8,4 @@ ACTION=="add", SUBSYSTEM=="module", KERNEL=="block", ATTR{parameters/events_dfl_
 ACTION=="change", SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST=="block", ATTR{block/*/uevent}="change"
 
 # watch metadata changes, caused by tools closing the device node which was opened for writing
-ACTION=="add", SUBSYSTEM=="block", KERNEL!="loop*|nvme*|sd*|vd*", OPTIONS+="watch"
+ACTION=="add", SUBSYSTEM=="block", KERNEL=="loop*|nvme*|sd*|vd*", OPTIONS+="watch"