udev: pull in printer.target from all kinds of printers

diff --git a/TODO b/TODO
index 3908311cd272f1391df021716334c12ee9b3ee8f..4367eb14e528deaf3d77125f8caa48b8c95c491d 100644 (file)
--- a/TODO
+++ b/TODO
@@ -23,6 +23,8 @@ F15 External:
 
 Features:
 
+* wildcard support for .path units (think CUPS spool directory!)
+
 * kernel: add /proc/sys file exposing CAP_LAST_CAP?
 
 * kernel: add device_type = "fb", "fbcon" to class "graphics"
@@ -39,8 +41,6 @@ Features:
   when we start a service in order to avoid confusion when a user
   assumes starting a service is enough to make it accessible
 
-* drop -lrt req for sd-daemon.[ch]
-
 * Make it possible to set the keymap independently from the font on
   the kernel cmdline. Right now setting one resets also the other.
 
@@ -52,8 +52,6 @@ Features:
 
 * add dbus call to convert snapshot into target
 
-* move /selinux to /sys/fs/selinux
-
 * detect LXC with $container=lxc
 
 * add prefix match to sysctl, tmpfiles, ...

diff --git a/src/99-systemd.rules b/src/99-systemd.rules
index c079c35304e83f63e0fca8898454767be35fd5c7..d2c41c1c5694d0bc172c3ae68dd3e230ecd6ea15 100644 (file)
--- a/src/99-systemd.rules
+++ b/src/99-systemd.rules
@@ -32,8 +32,11 @@ SUBSYSTEM=="net", KERNEL!="lo", TAG+="systemd", ENV{SYSTEMD_ALIAS}="/sys/subsyst
 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=="sound", KERNEL=="card*", TAG+="systemd", ENV{SYSTEMD_WANTS}="sound.target"
 
+SUBSYSTEM=="printer", TAG+="systemd", ENV{SYSTEMD_WANTS}="printer.target"
+SUBSYSTEM=="usb", KERNEL=="lp*", TAG+="systemd", ENV{SYSTEMD_WANTS}="printer.target"
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:0701*:", TAG+="systemd", ENV{SYSTEMD_WANTS}="printer.target"
+
 LABEL="systemd_end"