Reinstate detection of inappropriate uevent with DISK_RO set and suppress it.

We still need to detect this one! We're not so strict with CHANGE events as
with the ADD events while applying filters in the rules so this one would
pass and it would process the rules prematurely (because it appears *before*
the actual CHANGE event used when resuming a DM device while setting read-only
state at the same time).

diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM
index 888be96b97d3e269b0d838f6e5bd88604d55535f..85aae01006d760eee36c6ec6d29555f45ef0a583 100644 (file)
--- a/WHATS_NEW_DM
+++ b/WHATS_NEW_DM
@@ -1,5 +1,6 @@
 Version 1.02.54 - 
 ================================
+  Reinstate detection of inappropriate uevent with DISK_RO set and suppress it.
   Fix segfault in regex matcher with characters of ordinal value > 127.
   Use built-in rule for device aliases: block/ < dm- < disk/ < mapper/ < other.
   Wait for node creation before displaying debug info in dmsetup.

diff --git a/udev/10-dm.rules.in b/udev/10-dm.rules.in
index 5d2a22b412d08867f893312d4da379a8745430d9..c40805a8eeef0fc0bde80e455f3c58d899136904 100644 (file)
--- a/udev/10-dm.rules.in
+++ b/udev/10-dm.rules.in
@@ -42,6 +42,9 @@ ENV{DM_COOKIE}=="?*", IMPORT{program}="$env{DM_SBIN_PATH}/dmsetup udevflags $env
 # is not recommended.
 ACTION!="add|change", GOTO="dm_end"
 
+# Rule out easy-to-detect inappropriate events first.
+ENV{DISK_RO}=="1", GOTO="dm_disable"
+
 # There is no cookie set nor any flags encoded in events not originating
 # in libdevmapper so we need to detect this and try to behave correctly.
 # For such spurious events, regenerate all flags from current udev database content