X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2F99-systemd.rules;h=815c8fd5528c210fb48cfbdf3968c4b91dab35ea;hp=3f48d68ba25dffd656131080686243f11fd95b8f;hb=e2f3b44cfc8864bfea7c77ff4c383ce9b535f27e;hpb=4252a5b66d76681bb5fa3b8a3175f9c0d820b0e8

diff --git a/src/99-systemd.rules b/src/99-systemd.rules
index 3f48d68ba..815c8fd55 100644
--- a/src/99-systemd.rules
+++ b/src/99-systemd.rules
@@ -7,14 +7,12 @@
 
 ACTION!="add|change", GOTO="systemd_end"
 
-KERNEL=="tty[0-9]|tty1[0-2]", TAG="systemd"
-KERNEL=="ttyS*", TAG="systemd"
+ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", GOTO="systemd_end"
 
-SUBSYSTEM=="block", KERNEL!="ram*|loop*", TAG="systemd"
+KERNEL=="tty[0-9]|tty1[0-2]", TAG+="systemd"
+KERNEL=="ttyS*", TAG+="systemd"
 
-# DM finds it funny to create additional device nodes, we need to
-# merge them here, so that we recognize identical devices.
-SUBSYSTEM=="block", ENV{DM_NAME}!="", ENV{SYSTEMD_ALIAS}="/dev/mapper/$env{DM_NAME}"
+SUBSYSTEM=="block", KERNEL!="ram*|loop*", TAG+="systemd"
 
 # We need a hardware independent way to identify network devices. We
 # use the /sys/subsystem path for this. Current vanilla kernels don't
@@ -27,11 +25,11 @@ SUBSYSTEM=="block", ENV{DM_NAME}!="", ENV{SYSTEMD_ALIAS}="/dev/mapper/$env{DM_NA
 #
 # http://git.kernel.org/?p=linux/hotplug/udev.git;a=blob;f=libudev/libudev-enumerate.c;h=da831449dcaf5e936a14409e8e68ab12d30a98e2;hb=HEAD#l742
 
-SUBSYSTEM=="net", KERNEL!="lo", TAG="systemd", ENV{SYSTEMD_ALIAS}="/sys/subsystem/net/devices/%k"
-SUBSYSTEM=="bluetooth", TAG="systemd", ENV{SYSTEMD_ALIAS}="/sys/subsystem/bluetooth/devices/%k"
+SUBSYSTEM=="net", KERNEL!="lo", TAG+="systemd", ENV{SYSTEMD_ALIAS}="/sys/subsystem/net/devices/%k"
+SUBSYSTEM=="bluetooth", TAG+="systemd", ENV{SYSTEMD_ALIAS}="/sys/subsystem/bluetooth/devices/%k"
 
-SUBSYSTEM=="bluetooth", TAG="systemd", ENV{SYSTEMD_WANTS}="bluetooth.target"
-SUBSYSTEM=="printer", TAG="systemd", ENV{SYSTEMD_WANTS}="printer.target"
-ENV{ID_SMARTCARD_READER}=="*?", TAG="systemd", ENV{SYSTEMD_WANTS}="smartcard.target"
+SUBSYSTEM=="bluetooth", TAG+="systemd", ENV{SYSTEMD_WANTS}="bluetooth.target"
+SUBSYSTEM=="printer", TAG+="systemd", ENV{SYSTEMD_WANTS}="printer.target"
+ENV{ID_SMARTCARD_READER}=="*?", TAG+="systemd", ENV{SYSTEMD_WANTS}="smartcard.target"
 
 LABEL="systemd_end"