diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2009-05-25 17:58:48 +0200 |
|---|---|---|
| committer | Martin Pitt <martin.pitt@ubuntu.com> | 2009-05-25 17:58:48 +0200 |
| commit | c19fc4b809168025e20007d34f480eef28f8250c (patch) | |
| tree | be6150afad81cd952577caa447145d639bf5e202 | |
| parent | 08478023d6c1983b802a9d3d67e712221c441848 (diff) | |
keymap: ensure module rules match on the input device
Add a KERNEL=="input*" check to the input module matches, to ensure that the
ATTRS{name} check is really done against the input device, not to any random
name attached to a subdevice. Thanks to Kay Sievers!
| -rw-r--r-- | keymap/95-keymap.rules | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/keymap/95-keymap.rules b/keymap/95-keymap.rules index 32a901f..3d473e5 100644 --- a/keymap/95-keymap.rules +++ b/keymap/95-keymap.rules @@ -10,10 +10,10 @@ ENV{DMI_VENDOR}=="", GOTO="keyboard_end" # we need to check their input device product name # -ENV{DMI_VENDOR}=="IBM*", ATTRS{name}=="ThinkPad Extra Buttons", RUN+="keymap $name module-ibm" -ENV{DMI_VENDOR}=="LENOVO*", ATTRS{name}=="ThinkPad Extra Buttons", RUN+="keymap $name module-lenovo" -ENV{DMI_VENDOR}=="ASUS*", ATTRS{name}=="Asus Extra Buttons", ATTR{[dmi/id]product_name}=="W3J", RUN+="keymap $name module-asus-w3j" -ENV{DMI_VENDOR}=="Sony*", ATTRS{name}=="Sony Vaio Keys", RUN+="keymap $name module-sony" +ENV{DMI_VENDOR}=="IBM*", KERNELS=="input*", ATTRS{name}=="ThinkPad Extra Buttons", RUN+="keymap $name module-ibm" +ENV{DMI_VENDOR}=="LENOVO*", KERNELS=="input*", ATTRS{name}=="ThinkPad Extra Buttons", RUN+="keymap $name module-lenovo" +ENV{DMI_VENDOR}=="ASUS*", KERNELS=="input*", ATTRS{name}=="Asus Extra Buttons", ATTR{[dmi/id]product_name}=="W3J", RUN+="keymap $name module-asus-w3j" +ENV{DMI_VENDOR}=="Sony*", KERNELS=="input*", ATTRS{name}=="Sony Vaio Keys", RUN+="keymap $name module-sony" # Older Vaios have some different keys ENV{DMI_VENDOR}=="Sony*", ATTR{[dmi/id]product_name}=="*PCG-C1*|*PCG-K25*|*PCG-F1*|*PCG-F2*|*PCG-F3*|*PCG-F4*|*PCG-F5*|*PCG-F6*|*PCG-FX*|*PCG-FRV*|*PCG-GR*|*PCG-TR*|*PCG-NV*|*PCG-Z*|*VGN-S360*|*VGN-SZ2HP_B*", ATTRS{name}=="Sony Vaio Keys", RUN+="keymap $name module-sony-old" |