summaryrefslogtreecommitdiff
path: root/rules
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2011-08-04 23:25:03 +0200
committerKay Sievers <kay.sievers@vrfy.org>2011-08-04 23:25:03 +0200
commit617746e09795575c6258dd075ee7f0a44ce61e1e (patch)
treeaea373f6ba388530839d2ed5da9cf47970e5a1ed /rules
parent869c9031608f0796bb4363d5de5db058fe96fedd (diff)
rules: move input_id to default rules
On Tue, Aug 2, 2011 at 10:56, Thomas Bächler <thomas@archlinux.org> wrote: > Commit c49df20758e0f22778cfc93b598f2929f4c86272 prevented udev from > creating broken symlinks for bluetooth hid devices. Unfortunately, > it also removed the ID_INPUT=1 and ID_INPUT_{KEY,MOUSE}=1 properties > from those devices. Xorg relies on these properties for cold- and > hotplugging of input devices.
Diffstat (limited to 'rules')
-rw-r--r--rules/rules.d/50-udev-default.rules3
-rw-r--r--rules/rules.d/60-persistent-input.rules1
2 files changed, 2 insertions, 2 deletions
diff --git a/rules/rules.d/50-udev-default.rules b/rules/rules.d/50-udev-default.rules
index f5b181dcc0..30267fee63 100644
--- a/rules/rules.d/50-udev-default.rules
+++ b/rules/rules.d/50-udev-default.rules
@@ -20,6 +20,7 @@ KERNEL=="null|zero|full|random|urandom", MODE="0666"
KERNEL=="mem|kmem|port|nvram", GROUP="kmem", MODE="0640"
# input
+SUBSYSTEM=="input", ENV{ID_INPUT}=="", IMPORT{program}="input_id %p"
KERNEL=="mouse*|mice|event*", MODE="0640"
KERNEL=="ts[0-9]*|uinput", MODE="0640"
KERNEL=="js[0-9]*", MODE="0644"
@@ -50,7 +51,7 @@ SUBSYSTEM=="firewire", ATTR{units}=="*0x00b09d:0x00010*", GROUP="video"
SUBSYSTEM=="firewire", ATTR{units}=="*0x00a02d:0x010001*", GROUP="video"
SUBSYSTEM=="firewire", ATTR{units}=="*0x00a02d:0x014001*", GROUP="video"
-# libusb device nodes
+# 'libusb' device nodes
SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", MODE="0664"
SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="", IMPORT{program}="usb_id --export %p"
diff --git a/rules/rules.d/60-persistent-input.rules b/rules/rules.d/60-persistent-input.rules
index 65a6381fad..e7611f5706 100644
--- a/rules/rules.d/60-persistent-input.rules
+++ b/rules/rules.d/60-persistent-input.rules
@@ -4,7 +4,6 @@ ACTION=="remove", GOTO="persistent_input_end"
SUBSYSTEM!="input", GOTO="persistent_input_end"
SUBSYSTEMS=="bluetooth", GOTO="persistent_input_end"
-ENV{ID_INPUT}=="", IMPORT{program}="input_id %p"
SUBSYSTEMS=="usb", ENV{ID_BUS}=="", IMPORT{program}="usb_id --export %p"
# determine class name for persistent symlinks