From 47e9f5536d57677dd4307dc80804c1c5d700b864 Mon Sep 17 00:00:00 2001
From: Alexandre Bezroutchko <abb@gremwell.com>
Date: Wed, 24 Oct 2012 22:02:55 +0200
Subject: [PATCH] dom0+vm/usb: make original device name available

---
 misc/usb_add_change | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/misc/usb_add_change b/misc/usb_add_change
index b2b5e6a..d76cfca 100755
--- a/misc/usb_add_change
+++ b/misc/usb_add_change
@@ -13,13 +13,15 @@
 [ "$DEVTYPE" != "usb_device" ] && exit 0
 
 # xenstore doesn't allow dot in key name
-NAME=`basename ${DEVPATH} | tr . _`
+NAME=`basename ${DEVPATH}`
+XSNAME=`echo ${NAME} | tr . _`
+
 # FIXME: For some devices (my Cherry keyboard) ID_SERIAL does not
 # contain proper human-readable name, should find better method to
 # build devide description.
 #DESC=`python -c "dev='%d-%d' % (int('${BUSNUM}'.lstrip('0')), (int('${DEVNUM}'.lstrip('0'))-1)); from xen.util import vusb_util; print vusb_util.get_usbdevice_info(dev);"`
 DESC="${ID_VENDOR_ID}:${ID_MODEL_ID} ${ID_SERIAL}"
-XS_KEY="qubes-usb-devices/$NAME"
+XS_KEY="qubes-usb-devices/${XSNAME}"
 
 xenstore-write "$XS_KEY/desc" "$DESC"