From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Sun, 11 Oct 2009 16:18:43 +0000 (+0200)
Subject: keymap: fix usb_id invocation
X-Git-Tag: 174~750
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=e8f04b65f38cafe34af1dbbe4150b87b2771f1f9;p=elogind.git

keymap: fix usb_id invocation

For deciding whether to call usb_id, test the property which we are actually
querying further down.

https://launchpad.net/215035
---

diff --git a/extras/keymap/95-keymap.rules b/extras/keymap/95-keymap.rules
index 967bb4bed..4ce84bced 100644
--- a/extras/keymap/95-keymap.rules
+++ b/extras/keymap/95-keymap.rules
@@ -9,7 +9,7 @@ ACTION!="add", GOTO="keyboard_end"
 SUBSYSTEM!="input", GOTO="keyboard_end"
 KERNEL!="event*", GOTO="keyboard_end"
 
-SUBSYSTEMS=="usb", ENV{ID_MODEL}=="", IMPORT{program}="usb_id --export %p", GOTO="keyboard_usbcheck"
+SUBSYSTEMS=="usb", ENV{ID_VENDOR}=="", IMPORT{program}="usb_id --export %p", GOTO="keyboard_usbcheck"
 GOTO="keyboard_modulecheck"
 
 #