Add the ability to match on device names attached to.

If a device is attached to ums4, you can reference this devname in
the configuration file as ${DEVNAME} (a shell variable, yes).

1 files changed, 5 insertions, 6 deletions

diff --git a/etc/usbd.conf b/etc/usbd.conf
index 8d0adc7cf3c1..34841119ed11 100644
--- a/etc/usbd.conf
+++ b/etc/usbd.conf
@@ -9,7 +9,7 @@ device "ActiveWire board, firmware download"
    vendor  0x0854
    product 0x0100
    release 0x0000
-   attach "/usr/local/bin/ezdownload -f /usr/local/share/usb/firmware/0854.0100.0_01.hex"
+   attach "/usr/local/bin/ezdownload -f /usr/local/share/usb/firmware/0854.0100.0_01.hex ${DEVNAME}"
 
 # The piece below has to be copied for every drive. It does not work for the
 # generic case, the umass storage class uses interface drivers. The info for
@@ -19,15 +19,14 @@ device "USB Zip drive"
    vendor  0x059b
    product 0x0001
    release 0x0100
-   attach "/usr/bin/camcontrol rescan bus 0"
+   attach "/sbin/camcontrol rescan bus 0"
 
 # The entry below is for the Logitech mouse. Replace the product and vendor
 # id (and the device name of course) with the data for your mouse.
 #
-device "Logitech N48 USB mouse"
-   vendor 0x046d
-   product 0xc001
-   attach "/usr/sbin/moused -p /dev/ums0 -I /var/run/moused.ums0.pid"
+device "Mouse"
+   devname "ums[0-9]+"
+   attach "/usr/sbin/moused -p /dev/${DEVNAME} -I /var/run/moused.${DEVNAME}.pid"
 
 # The fallthrough entry: Nothing is specified, nothing is done.  And it isn't
 # necessary at all :-).  Just for pretty printing in debugging mode.