From 9a7b161c378301f70c6ef80b0ad7d07156add07c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Tue, 17 Mar 2015 23:11:47 +0100 Subject: [PATCH] qrexec: move qrexec-client-vm to /usr/bin --- qrexec/Makefile | 5 +++-- rpm_spec/core-vm.spec | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/qrexec/Makefile b/qrexec/Makefile index a42c244..3f27f63 100644 --- a/qrexec/Makefile +++ b/qrexec/Makefile @@ -14,8 +14,9 @@ install: install -d $(DESTDIR)/etc/qubes-rpc install -d $(DESTDIR)/usr/lib/qubes $(DESTDIR)/usr/bin install qrexec-agent $(DESTDIR)/usr/lib/qubes - install qrexec-client-vm $(DESTDIR)/usr/lib/qubes - ln -s qrexec-client-vm $(DESTDIR)/usr/lib/qubes/qrexec_client_vm + install qrexec-client-vm $(DESTDIR)/usr/bin + ln -s ../../bin/qrexec-client-vm $(DESTDIR)/usr/lib/qubes/qrexec-client-vm + ln -s ../../bin/qrexec-client-vm $(DESTDIR)/usr/lib/qubes/qrexec_client_vm install qrexec-fork-server $(DESTDIR)/usr/bin install qubes-rpc-multiplexer $(DESTDIR)/usr/lib/qubes diff --git a/rpm_spec/core-vm.spec b/rpm_spec/core-vm.spec index 2565bbf..9ad3b4a 100644 --- a/rpm_spec/core-vm.spec +++ b/rpm_spec/core-vm.spec @@ -405,6 +405,7 @@ rm -f %{name}-%{version} /usr/bin/xenstore-watch-qubes /usr/bin/qubes-desktop-run /usr/bin/qrexec-fork-server +/usr/bin/qrexec-client-vm %dir /usr/lib/qubes /usr/lib/qubes/vusb-ctl.py* /usr/lib/qubes/dispvm-prerun.sh