From 58d21f095f9acde3595d013030aeb23ccaff6941 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Thu, 8 Jun 2017 14:37:56 +0200 Subject: [PATCH] Remove old vusb scripts This is unused for a long time (since we've moved to USBIP). --- Makefile | 1 - debian/qubes-core-agent.install | 1 - misc/vusb-ctl.py | 24 ---------------- misc/xl-qvm-usb-attach.py | 48 -------------------------------- misc/xl-qvm-usb-detach.py | 49 --------------------------------- rpm_spec/core-agent.spec | 1 - 6 files changed, 124 deletions(-) delete mode 100755 misc/vusb-ctl.py delete mode 100755 misc/xl-qvm-usb-attach.py delete mode 100755 misc/xl-qvm-usb-detach.py diff --git a/Makefile b/Makefile index a2e9804..4517069 100644 --- a/Makefile +++ b/Makefile @@ -187,7 +187,6 @@ install-common: install -d $(DESTDIR)/etc/udev/rules.d install -m 0644 misc/udev-qubes-misc.rules $(DESTDIR)/etc/udev/rules.d/50-qubes-misc.rules install -d $(DESTDIR)$(LIBDIR)/qubes/ - install misc/vusb-ctl.py $(DESTDIR)$(LIBDIR)/qubes/ install misc/qubes-trigger-sync-appmenus.sh $(DESTDIR)$(LIBDIR)/qubes/ install -d -m 0750 $(DESTDIR)/etc/polkit-1/rules.d install -D -m 0644 misc/polkit-1-qubes-allow-all.pkla $(DESTDIR)/etc/polkit-1/localauthority/50-local.d/qubes-allow-all.pkla diff --git a/debian/qubes-core-agent.install b/debian/qubes-core-agent.install index 6a9e06e..d16ddf8 100644 --- a/debian/qubes-core-agent.install +++ b/debian/qubes-core-agent.install @@ -121,7 +121,6 @@ usr/lib/qubes/update-proxy-configs usr/lib/qubes/upgrades-installed-check usr/lib/qubes/upgrades-status-notify usr/lib/qubes/vm-file-editor -usr/lib/qubes/vusb-ctl.py usr/lib/qubes/xdg-icon usr/lib/systemd/user/pulseaudio.service.d/30_qubes.conf usr/lib/systemd/user/pulseaudio.socket.d/30_qubes.conf diff --git a/misc/vusb-ctl.py b/misc/vusb-ctl.py deleted file mode 100755 index eae621c..0000000 --- a/misc/vusb-ctl.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/python - -## -## Python script wrapper around xen.util.vusb_util bind_usb_device() and unbind_usb_device() methods -## Run as root in usbvm -## - -from xen.util import vusb_util -import sys -import os - -if len(sys.argv)!=3: - print 'usage: vusb-ctl device' - sys.exit(1) - -device=sys.argv[2] -if sys.argv[1] == 'bind': - vusb_util.bind_usb_device(device) -elif sys.argv[1] == 'unbind': - vusb_util.unbind_usb_device(device) -else: - print "Invalid command, must be 'bind' or 'unbind'" - sys.exit(1) - diff --git a/misc/xl-qvm-usb-attach.py b/misc/xl-qvm-usb-attach.py deleted file mode 100755 index 58ac2a8..0000000 --- a/misc/xl-qvm-usb-attach.py +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/python - -## -## This script is for dom0 -## The syntax is modelled after "xl block-attach" -## - -import sys -import os -import xen.lowlevel.xl - - -# parse command line -if (len(sys.argv)<4) or (len(sys.argv)>5): - print 'usage: xl-qvm-usb-attach.py []' - sys.exit(1) - -frontendvm_xid=sys.argv[1] -backendvm_device=sys.argv[2] - -frontend=sys.argv[3].split('-') -if len(frontend)!=2: - print 'Error: frontendvm-device must be in - format' - sys.exit(1) -(controller, port)=frontend - -if len(sys.argv)>4: - backendvm_xid=int(sys.argv[4]) - backendvm_name=xen.lowlevel.xl.ctx().domid_to_name(backendvm_xid) -else: - backendvm_xid=0 - -# FIXME: command injection -os.system("xenstore-write /local/domain/%s/backend/vusb/%s/%s/port/%s '%s'" - % (backendvm_xid, frontendvm_xid, controller, port, backendvm_device)) - -cmd = "/usr/lib/qubes/vusb-ctl.py bind '%s'" % backendvm_device -if backendvm_xid == 0: - os.system("sudo %s" % cmd) -else: - from qubes.qubes import QubesVmCollection - qvm_collection = QubesVmCollection() - qvm_collection.lock_db_for_reading() - qvm_collection.load() - qvm_collection.unlock_db() - - # launch - qvm_collection.get_vm_by_name(backendvm_name).run(cmd, user="root") diff --git a/misc/xl-qvm-usb-detach.py b/misc/xl-qvm-usb-detach.py deleted file mode 100755 index e32fe47..0000000 --- a/misc/xl-qvm-usb-detach.py +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/python - -## -## This script is for dom0 -## The syntax is modelled after "xl block-attach" -## FIXME: should be modelled after block-detach instead -## - -import sys -import os -import xen.lowlevel.xl - -# parse command line -if (len(sys.argv)<4) or (len(sys.argv)>5): - print 'usage: xl-qvm-usb-detach.py []' - sys.exit(1) - -frontendvm_xid=sys.argv[1] -backendvm_device=sys.argv[2] - -frontend=sys.argv[3].split('-') -if len(frontend)!=2: - print 'Error: frontendvm-device must be in - format' - sys.exit(1) -(controller, port)=frontend - -if len(sys.argv)>4: - backendvm_xid=int(sys.argv[4]) - backendvm_name=xen.lowlevel.xl.ctx().domid_to_name(backendvm_xid) -else: - backendvm_xid=0 - -cmd = "/usr/lib/qubes/vusb-ctl.py unbind '%s'" % backendvm_device -if backendvm_xid == 0: - os.system("sudo %s" % cmd) -else: - from qubes.qubes import QubesVmCollection - qvm_collection = QubesVmCollection() - qvm_collection.lock_db_for_reading() - qvm_collection.load() - qvm_collection.unlock_db() - - # launch - qvm_collection.get_vm_by_name(backendvm_name).run(cmd, user="root") - -# FIXME: command injection -os.system("xenstore-write /local/domain/%s/backend/vusb/%s/%s/port/%s ''" - % (backendvm_xid, frontendvm_xid, controller, port)) - diff --git a/rpm_spec/core-agent.spec b/rpm_spec/core-agent.spec index aad85a5..8bba1f2 100644 --- a/rpm_spec/core-agent.spec +++ b/rpm_spec/core-agent.spec @@ -534,7 +534,6 @@ rm -f %{name}-%{version} /usr/bin/qrexec-client-vm /usr/bin/qubes-session-autostart %dir /usr/lib/qubes -/usr/lib/qubes/vusb-ctl.py* /usr/lib/qubes/sync-ntp-clock /usr/lib/qubes/prepare-suspend /usr/lib/qubes/qrexec-agent