From 4d18800bc04fcaf4e5a55a961bbb9a1f447fd4cb Mon Sep 17 00:00:00 2001 From: Rusty Bird Date: Sun, 4 Dec 2016 16:52:18 +0000 Subject: [PATCH] v2: (dom0) qvm-move-to-vm: don't "rm -rf" vm name argument Fixes QubesOS/qubes-issues#2472 from commit bc29af7c0c5f1a48a17d2218e807497711af181d --- file-copy-vm/qvm-copy-to-vm | 4 ++++ file-copy-vm/qvm-move-to-vm | 24 ------------------------ rpm_spec/core-dom0-linux.spec | 2 +- 3 files changed, 5 insertions(+), 25 deletions(-) delete mode 100644 file-copy-vm/qvm-move-to-vm diff --git a/file-copy-vm/qvm-copy-to-vm b/file-copy-vm/qvm-copy-to-vm index eee5e25..e464e70 100644 --- a/file-copy-vm/qvm-copy-to-vm +++ b/file-copy-vm/qvm-copy-to-vm @@ -37,3 +37,7 @@ mkfifo -- "$RESPONSE" # can't use $@ with --localcmd, and $* would fail on whitespace /usr/lib/qubes/qfile-dom0-agent "$@" <"$RESPONSE" | qvm-run --pass-io "$VM" "QUBESRPC qubes.Filecopy dom0" >"$RESPONSE" + +if [ "${0##*/}" = "qvm-move-to-vm" ]; then + rm -rf -- "$@" +fi diff --git a/file-copy-vm/qvm-move-to-vm b/file-copy-vm/qvm-move-to-vm deleted file mode 100644 index 475530f..0000000 --- a/file-copy-vm/qvm-move-to-vm +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -# -# The Qubes OS Project, http://www.qubes-os.org -# -# Copyright (C) 2015 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. -# -# - -. qvm-copy-to-vm "$@" && -rm -rf -- "$@" diff --git a/rpm_spec/core-dom0-linux.spec b/rpm_spec/core-dom0-linux.spec index 2a6e878..8865df8 100644 --- a/rpm_spec/core-dom0-linux.spec +++ b/rpm_spec/core-dom0-linux.spec @@ -165,7 +165,7 @@ install -m 755 tools/qvm-xkill $RPM_BUILD_ROOT/usr/bin/ # file copy to VM install -m 755 file-copy-vm/qfile-dom0-agent $RPM_BUILD_ROOT/usr/lib/qubes/ install -m 755 file-copy-vm/qvm-copy-to-vm $RPM_BUILD_ROOT/usr/bin/ -install -m 755 file-copy-vm/qvm-move-to-vm $RPM_BUILD_ROOT/usr/bin/ +ln -s qvm-copy-to-vm $RPM_BUILD_ROOT/usr/bin/qvm-move-to-vm ### Icons mkdir -p $RPM_BUILD_ROOT/usr/share/qubes/icons