diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-08-16 13:37:14 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-08-16 14:34:16 +0200 |
| commit | a71eb567886dd7d24f94f65d3cbd8e9651096777 (patch) | |
| tree | eae66018e0bda4c5804c876d679e102581db5e14 /rules | |
| parent | 5492c62a25313ec645e7330c016e2e406f5205e0 (diff) | |
| download | systemd-a71eb567886dd7d24f94f65d3cbd8e9651096777.tar.gz systemd-a71eb567886dd7d24f94f65d3cbd8e9651096777.tar.bz2 systemd-a71eb567886dd7d24f94f65d3cbd8e9651096777.zip | |
udev: allow persistent storage rules work for ubi devices
Back in dbbf424c8b77c1649e822c20c0b1fee1d2cfd93d, we merged a rule to add
persistent storage for /dev/ubi*, but this rule could have never worked because
of the top-level exclude.
Also set "watch" for /dev/ubi*.
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/60-block.rules | 2 | ||||
| -rw-r--r-- | rules/60-persistent-storage.rules | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/rules/60-block.rules b/rules/60-block.rules index a320e63103..3134ab995e 100644 --- a/rules/60-block.rules +++ b/rules/60-block.rules @@ -9,5 +9,5 @@ ACTION=="change", SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST=="block", # watch metadata changes, caused by tools closing the device node which was opened for writing ACTION!="remove", SUBSYSTEM=="block", \ - KERNEL=="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|scm*|pmem*|nbd*|zd*", \ + 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" |