From c52d8b54d57fcb64089102eac9ce1b8466ee53fd Mon Sep 17 00:00:00 2001
From: Rafal Wojtczuk <rafal@invisiblethingslab.com>
Date: Mon, 14 Mar 2011 11:25:18 +0100
Subject: [PATCH] Added new qvm-open-in-dvm, aka qvm-open-in-dvm2

Small, childless bash script.
---
 appvm/qvm-dvm.desktop    |  2 +-
 appvm/qvm-open-in-dvm2   | 40 ++++++++++++++++++++++++++++++++++++++++
 rpm_spec/core-appvm.spec |  3 ++-
 3 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100755 appvm/qvm-open-in-dvm2

diff --git a/appvm/qvm-dvm.desktop b/appvm/qvm-dvm.desktop
index a7f5ad7..67f9ea5 100644
--- a/appvm/qvm-dvm.desktop
+++ b/appvm/qvm-dvm.desktop
@@ -4,7 +4,7 @@ Type=Service
 X-KDE-ServiceTypes=KonqPopupMenu/Plugin,all/allfiles
 
 [Desktop Action QvmDvm]
-Exec=/usr/bin/qvm-open-in-dvm disposable %U
+Exec=/usr/bin/qvm-open-in-dvm2 %U
 Icon=kget
 Name=Open In DisposableVM
 
diff --git a/appvm/qvm-open-in-dvm2 b/appvm/qvm-open-in-dvm2
new file mode 100755
index 0000000..eb0d4e2
--- /dev/null
+++ b/appvm/qvm-open-in-dvm2
@@ -0,0 +1,40 @@
+#!/bin/bash
+#
+# The Qubes OS Project, http://www.qubes-os.org
+#
+# Copyright (C) 2010  Rafal Wojtczuk  <rafal@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.
+#
+#
+
+if ! [ $# = 1 ] ; then 
+	echo "Usage: $0 filename"
+	exit 1
+fi
+
+FILE="$1"
+if ! [ "X""${FILE:0:1}" = X/ ] ; then
+	FILE="$PWD"/"$1"
+fi
+
+DVMSPOOL=/home/user/.dvmspool
+if ! [ -e $DVMSPOOL ] ; then
+	mkdir $DVMSPOOL || exit 1
+fi
+
+echo -n "$FILE" > $DVMSPOOL/req.$$
+echo -n DVMR > /var/run/qubes/qrexec_agent
+	
diff --git a/rpm_spec/core-appvm.spec b/rpm_spec/core-appvm.spec
index f7cc731..b947b83 100644
--- a/rpm_spec/core-appvm.spec
+++ b/rpm_spec/core-appvm.spec
@@ -72,7 +72,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/init.d
 cp qubes_core $RPM_BUILD_ROOT/etc/init.d/
 mkdir -p $RPM_BUILD_ROOT/var/lib/qubes
 mkdir -p $RPM_BUILD_ROOT/usr/bin
-cp qubes_timestamp qvm-copy-to-vm qvm-open-in-dvm $RPM_BUILD_ROOT/usr/bin
+cp qubes_timestamp qvm-copy-to-vm qvm-open-in-dvm qvm-open-in-dvm2 $RPM_BUILD_ROOT/usr/bin
 mkdir -p $RPM_BUILD_ROOT/usr/lib/qubes
 cp qubes_add_pendrive_script qubes_penctl qvm-copy-to-vm.kde $RPM_BUILD_ROOT/usr/lib/qubes
 cp ../qrexec/qrexec_agent $RPM_BUILD_ROOT/usr/lib/qubes
@@ -207,6 +207,7 @@ rm -rf $RPM_BUILD_ROOT
 /usr/bin/qvm-copy-to-vm
 /usr/lib/qubes/qvm-copy-to-vm.kde
 %attr(4755,root,root) /usr/bin/qvm-open-in-dvm
+/usr/bin/qvm-open-in-dvm2
 /usr/lib/qubes/qvm-dvm-transfer
 /usr/lib/qubes/meminfo-writer
 /usr/lib/qubes/dvm_file_editor