Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add convenient wrappers for qvm-copy-to-vm and qvm-move-to-vm

Browse Source 
Default `ask` policy ignore target domain specified by the caller, so it
doesn't make sense to specify one. Provide convenient wrappers not
needing one. Do not change behaviour of existing tools for compatibility
reasons.

Fixes QubesOS/qubes-issues#3141
This commit is contained in:
Marek Marczykowski-Górecki 2017-10-02 03:19:30 +02:00
parent 9c61ea0dcd
commit 486f17ec2d
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
4 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -235,7 +235,9 @@ install-common: install-doc
install -m 0755 misc/qvm-features-request $(DESTDIR)$(BINDIR)/qvm-features-request 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 -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-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-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.kde $(DESTDIR)$(LIBDIR)/qubes
install qubes-rpc/qvm-copy-to-vm.gnome $(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 install qubes-rpc/qvm-move-to-vm.kde $(DESTDIR)$(LIBDIR)/qubes

2
debian/qubes-core-agent.install vendored
View File

@ -86,8 +86,10 @@ lib/systemd/system/systemd-timesyncd.service.d/30_qubes.conf
usr/bin/qubes-desktop-run usr/bin/qubes-desktop-run
usr/bin/qubes-open usr/bin/qubes-open
usr/bin/qubes-session-autostart usr/bin/qubes-session-autostart
usr/bin/qvm-copy
usr/bin/qvm-copy-to-vm usr/bin/qvm-copy-to-vm
usr/bin/qvm-features-request usr/bin/qvm-features-request
usr/bin/qvm-move
usr/bin/qvm-move-to-vm usr/bin/qvm-move-to-vm
usr/bin/qvm-open-in-dvm usr/bin/qvm-open-in-dvm
usr/bin/qvm-open-in-vm usr/bin/qvm-open-in-vm

25
qubes-rpc/qvm-copy Normal file
View File

@ -0,0 +1,25 @@
#!/bin/sh
set -e
#
# The Qubes OS Project, https://www.qubes-os.org
#
# Copyright (C) 2017 Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
#
# 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' "$@"

2
rpm_spec/core-agent.spec
View File

@ -576,6 +576,8 @@ rm -f %{name}-%{version}
/usr/sbin/qubes-serial-login /usr/sbin/qubes-serial-login
/usr/bin/qvm-copy-to-vm /usr/bin/qvm-copy-to-vm
/usr/bin/qvm-move-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-dvm
/usr/bin/qvm-open-in-vm /usr/bin/qvm-open-in-vm
/usr/bin/qvm-run-vm /usr/bin/qvm-run-vm