diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2009-06-19 19:21:26 +0200 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2009-06-19 19:21:26 +0200 |
| commit | 9ab11b6258abe2c9c0420a70e5b21f3f341c82c5 (patch) | |
| tree | 6847535416df7f49f93eb7e880a4089a00285bf9 | |
| parent | 3ab2be88bde4c0baa1b3cad5d473bc07a8b5c1fb (diff) | |
| parent | a33da970ef0e07f204d6bfef4690902195dc4818 (diff) | |
Merge branch 'master' of git+ssh://master.kernel.org/pub/scm/linux/hotplug/udev
| -rw-r--r-- | extras/keymap/README.keymap.txt | 2 | ||||
| -rw-r--r-- | extras/udev-acl/70-acl.rules | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/extras/keymap/README.keymap.txt b/extras/keymap/README.keymap.txt index 1558db8782..eab8587de8 100644 --- a/extras/keymap/README.keymap.txt +++ b/extras/keymap/README.keymap.txt @@ -44,7 +44,7 @@ for inclusion you need to do the following steps: 1. Find the keyboard device. - Run /usr/share/udev/findkeyboards. This should always give you an "AT + Run /lib/udev/findkeyboards. This should always give you an "AT keyboard" and possibly a "module". Some laptops (notably Thinkpads, Sonys, and Acers) have multimedia/function keys on a separate input device instead of the primary keyboard. The keyboard device should have a name like "input/event3". diff --git a/extras/udev-acl/70-acl.rules b/extras/udev-acl/70-acl.rules index fc27039597..26b805565a 100644 --- a/extras/udev-acl/70-acl.rules +++ b/extras/udev-acl/70-acl.rules @@ -17,6 +17,9 @@ KERNEL=="sg[0-9]*", ATTRS{type}=="3", ATTRS{vendor}=="HP|EPSON|Epson", ENV{ACL_M # USB scanners ENV{libsane_matched}=="yes", ENV{ACL_MANAGE}="1" +# HPLIP devices (necessary for ink level check and HP tool maintenance) +ENV{ID_HPLIP}=="1", ENV{ACL_MANAGE}="1" + # optical drives SUBSYSTEM=="block", ENV{ID_CDROM}=="1", ENV{ACL_MANAGE}="1" |