summaryrefslogtreecommitdiff
path: root/rules
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2019-08-20 13:55:47 +0200
committerGitHub <noreply@github.com>2019-08-20 13:55:47 +0200
commit48a81b20ab95bacbedc2d61afe2eac1d972f0a8d (patch)
tree87e7ff21fe50ad34922a89516f8e85e5328f9392 /rules
parent2dbc45aea747f25cc1c3848fded2ec0062f96bcf (diff)
parenta71eb567886dd7d24f94f65d3cbd8e9651096777 (diff)
downloadsystemd-48a81b20ab95bacbedc2d61afe2eac1d972f0a8d.tar.gz
Merge pull request #13360 from keszybz/udev-watch-more
udev: set "watch" for more devices
Diffstat (limited to 'rules')
-rw-r--r--rules/60-block.rules4
-rw-r--r--rules/60-persistent-storage.rules2
2 files changed, 4 insertions, 2 deletions
diff --git a/rules/60-block.rules b/rules/60-block.rules
index 491081f0b2..3134ab995e 100644
--- a/rules/60-block.rules
+++ b/rules/60-block.rules
@@ -8,4 +8,6 @@ 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!="remove", SUBSYSTEM=="block", KERNEL=="loop*|nvme*|sd*|vd*|xvd*|pmem*|mmcblk*|dasd*|nbd*", OPTIONS+="watch"
+ACTION!="remove", SUBSYSTEM=="block", \
+ KERNEL=="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|ubi*|scm*|pmem*|nbd*|zd*", \
+ OPTIONS+="watch"
diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules
index 1d8880ef02..7802b1c94f 100644
--- a/rules/60-persistent-storage.rules
+++ b/rules/60-persistent-storage.rules
@@ -7,7 +7,7 @@ ACTION=="remove", GOTO="persistent_storage_end"
ENV{UDEV_DISABLE_PERSISTENT_STORAGE_RULES_FLAG}=="1", GOTO="persistent_storage_end"
SUBSYSTEM!="block", GOTO="persistent_storage_end"
-KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|scm*|pmem*|nbd*|zd*", GOTO="persistent_storage_end"
+KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|ubi*|scm*|pmem*|nbd*|zd*", GOTO="persistent_storage_end"
# ignore partitions that span the entire disk
TEST=="whole_disk", GOTO="persistent_storage_end"