summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-07-05 03:27:14 +0200
committerLennart Poettering <lennart@poettering.net>2011-07-05 03:29:24 +0200
commit5db35d0672949f2d418b4f5dfad2975c4b7e7691 (patch)
tree423fabd11ac45c4860053a5a998524911ee5561f
parent7862f62de3d5e71a63391e6ce7ecaee080bc6a2d (diff)
udev: pull in printer.target from all kinds of printers
-rw-r--r--TODO6
-rw-r--r--src/99-systemd.rules5
2 files changed, 6 insertions, 5 deletions
diff --git a/TODO b/TODO
index 3908311cd2..4367eb14e5 100644
--- 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 c079c35304..d2c41c1c56 100644
--- 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"