From 14a9390e8f31d217fe1814e058ee0043e2c2989d Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Mon, 28 Feb 2011 21:39:59 +0100
Subject: Fill variables for stuff to remove after virtual machine session and
 move the session tmp for VMware into /var/tmp (handled by uniontmp).

---
 src/os-plugins/plugins/virtualbox/files/run-virt.include | 6 ++++--
 src/os-plugins/plugins/vmware/files/run-virt.include     | 9 +++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/os-plugins/plugins/virtualbox/files/run-virt.include b/src/os-plugins/plugins/virtualbox/files/run-virt.include
index d05913ad..2efcc779 100644
--- a/src/os-plugins/plugins/virtualbox/files/run-virt.include
+++ b/src/os-plugins/plugins/virtualbox/files/run-virt.include
@@ -1,7 +1,7 @@
 # run-virt.include
 # -----------------------------------------------------------------------------
-# Copyright (c) 2009..2010 - RZ Uni Freiburg
-# Copyright (c) 2009..2010 - OpenSLX GmbH
+# Copyright (c) 2009..2011 - RZ Uni Freiburg
+# Copyright (c) 2009..2011 - OpenSLX GmbH
 #
 # This program/file is free software distributed under the GPL version 2.
 # See http://openslx.org/COPYING
@@ -373,3 +373,5 @@ VIRTCMDOPTS="--startvm ${machineuuid} --start-running"
 # set headless mode (-v off to disable vrdp)
 VIRTCMDHL=$(which VBoxHeadless 2>/dev/null)
 VIRTCMDOPTSHL="-s ${machineuuid}"
+RMDIRS="${TMPDIR}"
+
diff --git a/src/os-plugins/plugins/vmware/files/run-virt.include b/src/os-plugins/plugins/vmware/files/run-virt.include
index 2010dc4b..6f1098d5 100644
--- a/src/os-plugins/plugins/vmware/files/run-virt.include
+++ b/src/os-plugins/plugins/vmware/files/run-virt.include
@@ -1,7 +1,7 @@
 # run-virt.include
 # -----------------------------------------------------------------------------
-# Copyright (c) 2009..2010 - RZ Uni Freiburg
-# Copyright (c) 2009..2010 - OpenSLX GmbH
+# Copyright (c) 2009..2011 - RZ Uni Freiburg
+# Copyright (c) 2009..2011 - OpenSLX GmbH
 #
 # This program is free software distributed under the GPL version 2.
 # See http://openslx.org/COPYING
@@ -227,9 +227,9 @@ pref.eula.1.buildNumber = \"${vmbuild}\"" >${vmhome}/preferences
 # VM-ID static (0D), remove if changed to 00
 VM_ID="0D"
 # temporary disk space for logs, etc...
-redodir=/tmp/vmware/${USER}
+redodir=/var/tmp/vmware/${USER}
 # dir for configs and vmem file
-confdir=${redodir}
+confdir=/var/tmp/vmware/${USER}
 # configfile
 conffile="${confdir}/run-vmware.conf"
 # diskfile
@@ -446,3 +446,4 @@ writelog ""
 # using the modified version of the wrapper script
 VIRTCMD="${OPENSLX_DEFAULT_BINDIR}/vmplayer"
 VIRTCMDOPTS="${vmopt} ${conffile}"
+RMDIRS="${redodir} ${conffile}"
-- 
cgit v1.2.3-55-g7522