shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-10 01:17:44 +03:00
Code

rules: move input_id rule to a separate file

Browse Source 
This places the input_id call after the evdev hwdb calls. With this the
hwdb fixups in evdev can affect the device capabilities assigned in
input_id.

Remove the ID_INPUT_KEY dependency in atkbd rule because it is now not
assigned at this point.
This commit is contained in:
Michal Suchanek 2017-06-12 13:43:05 +02:00
parent 3ee4e61b11
commit 38887d1bd5
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -3887,6 +3887,7 @@ dist_udevrules_DATA += \
nodist_udevrules_DATA += \ nodist_udevrules_DATA += \
rules/50-udev-default.rules \ rules/50-udev-default.rules \
rules/60-input-id.rules \
rules/99-systemd.rules rules/99-systemd.rules
udevconfdir = $(sysconfdir)/udev udevconfdir = $(sysconfdir)/udev

1
rules/50-udev-default.rules.in
View File

@ -11,7 +11,6 @@ SUBSYSTEM=="rtc", ATTR{hctosys}=="1", SYMLINK+="rtc"
SUBSYSTEM=="rtc", KERNEL=="rtc0", SYMLINK+="rtc", OPTIONS+="link_priority=-100" SUBSYSTEM=="rtc", KERNEL=="rtc0", SYMLINK+="rtc", OPTIONS+="link_priority=-100"
SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", IMPORT{builtin}="usb_id", IMPORT{builtin}="hwdb --subsystem=usb" SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", IMPORT{builtin}="usb_id", IMPORT{builtin}="hwdb --subsystem=usb"
SUBSYSTEM=="input", ENV{ID_INPUT}=="", IMPORT{builtin}="input_id"
ENV{MODALIAS}!="", IMPORT{builtin}="hwdb --subsystem=$env{SUBSYSTEM}" ENV{MODALIAS}!="", IMPORT{builtin}="hwdb --subsystem=$env{SUBSYSTEM}"
ACTION!="add", GOTO="default_end" ACTION!="add", GOTO="default_end"

2
rules/60-evdev.rules
View File

@ -8,7 +8,7 @@ IMPORT{builtin}="hwdb --subsystem=input --lookup-prefix=evdev:", \
RUN{builtin}+="keyboard", GOTO="evdev_end" RUN{builtin}+="keyboard", GOTO="evdev_end"
# AT keyboard matching by the machine's DMI data # AT keyboard matching by the machine's DMI data
ENV{ID_INPUT_KEY}=="?*", DRIVERS=="atkbd", \ DRIVERS=="atkbd", \
IMPORT{builtin}="hwdb 'evdev:atkbd:$attr{[dmi/id]modalias}'", \ IMPORT{builtin}="hwdb 'evdev:atkbd:$attr{[dmi/id]modalias}'", \
RUN{builtin}+="keyboard", GOTO="evdev_end" RUN{builtin}+="keyboard", GOTO="evdev_end"

7
rules/60-input-id.rules Normal file
View File

@ -0,0 +1,7 @@
# do not edit this file, it will be overwritten on update
ACTION=="remove", GOTO="id_input_end"
SUBSYSTEM=="input", ENV{ID_INPUT}=="", IMPORT{builtin}="input_id"
LABEL="id_input_end"