summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pitt <martin.pitt@ubuntu.com>2015-06-09 07:15:59 +0200
committerMartin Pitt <martin.pitt@ubuntu.com>2015-06-09 07:15:59 +0200
commit6f90fe6de6c1086502d300bfc54b8b19c59a22a9 (patch)
tree3ab25424f8348f14074b20148c13a44294a277c9
parent02776da6ec90d28799561407d8a07f76d1c2c120 (diff)
parentbb5c512de22eeb7464f120a01fd1d59e7a4bbb7b (diff)
Merge pull request #114 from crawford/xen
rules: whitelist xvd* devices
-rw-r--r--rules/60-block.rules2
-rw-r--r--rules/60-persistent-storage.rules2
2 files changed, 2 insertions, 2 deletions
diff --git a/rules/60-block.rules b/rules/60-block.rules
index a69d648023..c74caca49f 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!="remove", SUBSYSTEM=="block", KERNEL=="loop*|nvme*|sd*|vd*", OPTIONS+="watch"
+ACTION!="remove", SUBSYSTEM=="block", KERNEL=="loop*|nvme*|sd*|vd*|xvd*", OPTIONS+="watch"
diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules
index 64c5f1cfdd..2daeb6db42 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]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*|bcache*|xvd*", GOTO="persistent_storage_end"
+KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*|xvd*|bcache*", GOTO="persistent_storage_end"
# ignore partitions that span the entire disk
TEST=="whole_disk", GOTO="persistent_storage_end"