diff --git a/Makefile b/Makefile index b656d9a..932bf33 100644 --- a/Makefile +++ b/Makefile @@ -235,7 +235,9 @@ install-common: install-doc install -m 0755 misc/qvm-features-request $(DESTDIR)$(BINDIR)/qvm-features-request install -m 0755 qubes-rpc/qvm-sync-clock $(DESTDIR)$(BINDIR)/qvm-sync-clock install qubes-rpc/{qvm-open-in-dvm,qvm-open-in-vm,qvm-copy-to-vm,qvm-run-vm} $(DESTDIR)/usr/bin + install qubes-rpc/qvm-copy $(DESTDIR)/usr/bin ln -s qvm-copy-to-vm $(DESTDIR)/usr/bin/qvm-move-to-vm + ln -s qvm-copy $(DESTDIR)/usr/bin/qvm-move install qubes-rpc/qvm-copy-to-vm.kde $(DESTDIR)$(LIBDIR)/qubes install qubes-rpc/qvm-copy-to-vm.gnome $(DESTDIR)$(LIBDIR)/qubes install qubes-rpc/qvm-move-to-vm.kde $(DESTDIR)$(LIBDIR)/qubes diff --git a/debian/qubes-core-agent.install b/debian/qubes-core-agent.install index fade43a..1eb21b4 100644 --- a/debian/qubes-core-agent.install +++ b/debian/qubes-core-agent.install @@ -86,8 +86,10 @@ lib/systemd/system/systemd-timesyncd.service.d/30_qubes.conf usr/bin/qubes-desktop-run usr/bin/qubes-open usr/bin/qubes-session-autostart +usr/bin/qvm-copy usr/bin/qvm-copy-to-vm usr/bin/qvm-features-request +usr/bin/qvm-move usr/bin/qvm-move-to-vm usr/bin/qvm-open-in-dvm usr/bin/qvm-open-in-vm diff --git a/qubes-rpc/qvm-copy b/qubes-rpc/qvm-copy new file mode 100644 index 0000000..d77e7a5 --- /dev/null +++ b/qubes-rpc/qvm-copy @@ -0,0 +1,25 @@ +#!/bin/sh +set -e +# +# The Qubes OS Project, https://www.qubes-os.org +# +# Copyright (C) 2017 Marek Marczykowski-Górecki +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# + +# shellcheck disable=SC2016 +exec "$0-to-vm" '$default' "$@" diff --git a/rpm_spec/core-agent.spec b/rpm_spec/core-agent.spec index ddce418..159dd1c 100644 --- a/rpm_spec/core-agent.spec +++ b/rpm_spec/core-agent.spec @@ -576,6 +576,8 @@ rm -f %{name}-%{version} /usr/sbin/qubes-serial-login /usr/bin/qvm-copy-to-vm /usr/bin/qvm-move-to-vm +/usr/bin/qvm-copy +/usr/bin/qvm-move /usr/bin/qvm-open-in-dvm /usr/bin/qvm-open-in-vm /usr/bin/qvm-run-vm