X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2F99-systemd.rules;h=95a91ec174e9b6243d8201305583b64f065b1dd6;hb=294d81f124568983323a53f40bfbaa371f0da077;hp=70c0d8191a4b91f711a15264c16dc6ac11c2af67;hpb=e1ce2c2782015579f042d4d6963ed039333fb8c2;p=elogind.git

diff --git a/src/99-systemd.rules b/src/99-systemd.rules
index 70c0d8191..95a91ec17 100644
--- a/src/99-systemd.rules
+++ b/src/99-systemd.rules
@@ -10,7 +10,11 @@ ACTION!="add|change", GOTO="systemd_end"
 KERNEL=="tty[0-9]|tty1[0-2]", TAG="systemd"
 KERNEL=="ttyS*", TAG="systemd"
 
-SUBSYSTEM=="block", TAG="systemd"
+SUBSYSTEM=="block", KERNEL!="ram*|loop*", 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}"
 
 # We need a hardware independent way to identify network devices. We
 # use the /sys/subsystem path for this. Current vanilla kernels don't
@@ -24,5 +28,10 @@ SUBSYSTEM=="block", TAG="systemd"
 # 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=="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"