diff options
author | Dirk von Suchodoletz | 2011-02-28 21:39:59 +0100 |
---|---|---|
committer | Dirk von Suchodoletz | 2011-02-28 21:39:59 +0100 |
commit | 14a9390e8f31d217fe1814e058ee0043e2c2989d (patch) | |
tree | 486c5c0ac6d560268d2e053d89cade6e063307e6 /src | |
parent | transfer fixes from 4.2 (diff) | |
download | core-14a9390e8f31d217fe1814e058ee0043e2c2989d.tar.gz core-14a9390e8f31d217fe1814e058ee0043e2c2989d.tar.xz core-14a9390e8f31d217fe1814e058ee0043e2c2989d.zip |
Fill variables for stuff to remove after virtual machine session and
move the session tmp for VMware into /var/tmp (handled by uniontmp).
Diffstat (limited to 'src')
-rw-r--r-- | src/os-plugins/plugins/virtualbox/files/run-virt.include | 6 | ||||
-rw-r--r-- | src/os-plugins/plugins/vmware/files/run-virt.include | 9 |
2 files changed, 9 insertions, 6 deletions
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}" |