From 3467aef515acaac01760c3e92cc3db09dc474d96 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 7 Jan 2016 16:19:27 +0100
Subject: [run-virt,vmware,vbox] Unify directory layout in /tmp, better cleanup

---
 .../vmware/includes/set_vmware_include_variables.inc          | 11 -----------
 .../vmware/data/opt/openslx/vmchooser/vmware/run-virt.include |  1 -
 2 files changed, 12 deletions(-)

(limited to 'remote/modules/vmware/data')

diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/set_vmware_include_variables.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/set_vmware_include_variables.inc
index 5a5d1132..0c45ee59 100644
--- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/set_vmware_include_variables.inc
+++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/set_vmware_include_variables.inc
@@ -5,17 +5,6 @@
 set_vmware_include_variables() {
 	[ "$mem" -gt 3800 -a "$(uname -m)" != "x86_64" ] && mem=3800
 	
-	# VM-ID static (0D), remove if changed to 00
-	VM_ID="0D"
-	
-	# should be dynamic
-	if [ "x$(which bc)" != "x" ]; then
-	        VM_ID=$(echo "obase=16; $$" | bc)
-	        VM_ID=$(expr substr $VM_ID $(expr ${#VM_ID} - 1) 2)
-	else
-	        VM_ID=$[ $$ % 100 ]
-	fi
-	
 	# temporary disk space for logs, etc...
 	redodir="/tmp/virt/vmware/${USER}.$$"
 	
diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/run-virt.include b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/run-virt.include
index a823df72..f63092bd 100644
--- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/run-virt.include
+++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/run-virt.include
@@ -68,5 +68,4 @@ cp "$conffile" "/tmp/vmware-last-config"
 # using the modified version of the wrapper script
 VIRTCMD="/opt/openslx/bin/vmplayer"
 VIRTCMDOPTS="${vmopt} ${conffile}"
-RMDIRS="${redodir} ${conffile}"
 
-- 
cgit v1.2.3-55-g7522