--- trunk/udev/udev-persistent-input.rules.magellan	2008/12/22 20:31:37	717
+++ trunk/udev/udev-persistent-input.rules.magellan	2009/04/24 14:19:13	760
@@ -1,5 +1,5 @@
 # /etc/udev/rules/60-persistent-input.rules:  device naming rules for udev
-# $Header: /root/magellan-cvs/src/udev/udev-persistent-input.rules.magellan,v 1.5 2008-12-22 20:31:37 niro Exp $
+# $Header: /root/magellan-cvs/src/udev/udev-persistent-input.rules.magellan,v 1.6 2009-04-24 14:19:13 niro Exp $
 #
 # There are a number of modifiers that are allowed to be used in some
 # of the different fields. They provide the following subsitutions:
@@ -23,7 +23,7 @@
 KERNEL=="input[0-9]*", GOTO="persistent_input_end"
 
 # usb devices
-SUBSYSTEMS=="usb", IMPORT{program}="usb_id --export"
+SUBSYSTEMS=="usb", IMPORT{program}="usb_id --export %p"
 SUBSYSTEMS=="usb", ATTRS{bInterfaceClass}=="03", ATTRS{bInterfaceProtocol}=="01", ENV{ID_CLASS}="kbd"
 SUBSYSTEMS=="usb", ATTRS{bInterfaceClass}=="03", ATTRS{bInterfaceProtocol}=="02", ENV{ID_CLASS}="mouse"
 
@@ -44,8 +44,8 @@
 
 # by-path
 IMPORT{program}="path_id %p"
-ENV{ID_PATH}=="?*", KERNEL=="mouse*|js*", SYMLINK+="input/by-path/$env{ID_PATH}-$env{ID_CLASS}"
-ENV{ID_PATH}=="?*", KERNEL=="event*", SYMLINK+="input/by-path/$env{ID_PATH}-event-$env{ID_CLASS}"
+ENV{ID_PATH}=="?*", KERNEL=="mouse*|js*", ENV{ID_CLASS}=="?*", SYMLINK+="input/by-path/$env{ID_PATH}-$env{ID_CLASS}"
+ENV{ID_PATH}=="?*", KERNEL=="event*", ENV{ID_CLASS}=="?*", SYMLINK+="input/by-path/$env{ID_PATH}-event-$env{ID_CLASS}"
 
 LABEL="persistent_input_end"