From 706f93c8fdc61548974dc23c8901b2da748abfb7 Mon Sep 17 00:00:00 2001
From: Alexandre Bezroutchko <abb@gremwell.com>
Date: Wed, 10 Oct 2012 22:57:18 +0200
Subject: [PATCH] dvp/qvm-usb: split installation script for non-dom0 usb
 backend

---
 install-pvusb-backend.sh | 10 +++-------
 install-pvusb-dom0.sh    | 11 +++++++++++
 2 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100755 install-pvusb-dom0.sh

diff --git a/install-pvusb-backend.sh b/install-pvusb-backend.sh
index 9ce29c56..9032f28b 100755
--- a/install-pvusb-backend.sh
+++ b/install-pvusb-backend.sh
@@ -6,13 +6,9 @@
 ##
 
 # Copy files
-for f in usb_add_change usb_remove xl-qvm-usb-attach.py ; do
-	cp misc/$f /usr/lib/qubes/$f
-done
-
-cp dom0/qvm-core/qubesutils.py /usr/lib64/python2.6/site-packages/qubes/qubesutils.py
-cp dom0/qvm-tools/qvm-usb /usr/bin/qvm-usb
-
+cp misc/usb_add_change /usr/lib/qubes/usb_add_change
+cp misc/usb_remove /usr/lib/qubes/usb_remove
+# FIXME cp misc/xen-vusb-helper.py /usr/lib/qubes/xen-vusb-helper.py
 cp misc/qubes_usb.rules /etc/udev/rules.d/99-qubes_usb.rules
 
 # Reload PVUSB backend and cleanup xenstore
diff --git a/install-pvusb-dom0.sh b/install-pvusb-dom0.sh
new file mode 100755
index 00000000..f96eaaff
--- /dev/null
+++ b/install-pvusb-dom0.sh
@@ -0,0 +1,11 @@
+#!/bin/sh -xe
+
+##
+## Run this script in dom0
+## FIXME: this has to be done after each reboot
+##
+
+# Copy files
+cp misc/xl-qvm-usb-attach.py /usr/lib/qubes/xl-qvm-usb-attach.py
+cp dom0/qvm-core/qubesutils.py /usr/lib64/python2.6/site-packages/qubes/qubesutils.py
+cp dom0/qvm-tools/qvm-usb /usr/bin/qvm-usb