From 0e3b1d69a4c08a2e71aae2247f575325a301d259 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 3 Aug 2016 14:49:51 +0200
Subject: [run-virt/vmware] Patch resolution into vmx if it's an "odd one"

vmware doesn't allow some resolutions by default on some guests, so
this workaround forces the desired resolution by some additional vmx
entries.
---
 .../openslx/vmchooser/vmware/includes/parse_vmx.inc  | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

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

diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc
index 878e9a9d..69ec513a 100644
--- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc
+++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc
@@ -128,8 +128,26 @@ if [ -n "$SLX_EXAM" ]; then
 	echo 'gui.restricted = "true"' >> "${TMPCONFIG}"
 fi
 
+# Hack resolution if we know the desired one is not in the default list of vmx_svga
+# For now, only do it on the odd ones, as we don't know if this has any side effects
+# This seems unnecessary on Win7 but is required on WinXP - need more research for other OSs
+case "$RESOLUTION" in
+	1600x900|2560x1440|2880x1800|3200x1800)
+		X=${RESOLUTION%x*}
+		Y=${RESOLUTION#*x}
+		BYTES=$(( ( ( X * Y * 4  + 65535 ) / 65536 ) * 65536 ))
+		[ "$BYTES" -lt 16777216 ] && BYTES=16777216
+		cat >> "${TMPCONFIG}" <<-EOF
+		svga.autodetect = "FALSE"
+		svga.vramSize = $BYTES
+		svga.maxWidth = $X
+		svga.maxHeight = $Y
+		EOF
+		;;
+esac
+
 # Killing duplicate lines (output much nicer than sort -u):
-awk '!a[$0]++' "${TMPCONFIG}" > "${TMPCONFIG}.tmp" && mv "${TMPCONFIG}.tmp" "${TMPCONFIG}"
+awk '!a[$0]++' "${TMPCONFIG}" > "${TMPCONFIG}.tmp" && mv -f "${TMPCONFIG}.tmp" "${TMPCONFIG}"
 
 # Apply $maxhardwareversion to final VMX
 HWVER=$(grep -i -m1 '^virtualHW.version *= *' "${TMPCONFIG}" | awk -F '=' '{print $2}' | sed -r 's/[^0-9]//g')
-- 
cgit v1.2.3-55-g7522


From eb0587ff0fc3b56409dc2f463af74c496991cd0a Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 5 Sep 2016 19:27:11 +0200
Subject: [vmware] Rely on usb config from server, only do fallback

---
 .../vmchooser/vmware/includes/parse_vmx.inc        | 38 +++++++++++++---------
 1 file changed, 23 insertions(+), 15 deletions(-)

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

diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc
index 69ec513a..edbaeddc 100644
--- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc
+++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc
@@ -18,7 +18,7 @@ echo 'ethernet0.addressType = "static"'		>> "${TMPCONFIG}"
 echo 'ethernet0.address = "'"${macaddr}"'"'	>> "${TMPCONFIG}"
 
 # DVD, CDROM
-# XXX: For now it's save to assume ide channel 1 is free, as we support only one HDD, and it it's IDE, it's on channel 0
+# XXX: For now it's safe to assume ide channel 1 is free, as we support only one HDD, and if it's IDE, it's on channel 0
 cat >> "${TMPCONFIG}" <<-HEREEND
 ide1:0.present = "$cdrom0"
 ide1:0.autodetect = "TRUE"
@@ -60,17 +60,21 @@ MemAllowAutoScaleDown = "FALSE"
 MemTrimRate = "-1"
 HEREEND
 
-# USB
-if [ -n "$SLX_EXAM" ]; then
-	# Exam mode: No USB (TODO: Configurable)
-	sed -i '/^usb\./d' "${TMPCONFIG}"
-	echo 'usb.present = "FALSE"' >> "${TMPCONFIG}"
-else
-	cat >> "${TMPCONFIG}" <<-HEREEND
-	usb.present = "TRUE"
-	usb.generic.autoconnect = "TRUE"
-	HEREEND
+# USB fallback: Only write usb config if there's none
+if ! grep -q -i "^usb\.present" "${TMPCONFIG}"; then
+	# Nothing found, go ahead
+	if [ -n "$SLX_EXAM" ]; then
+		# Exam mode: Default to no USB
+		sed -i '/^usb\./Id' "${TMPCONFIG}"
+		echo 'usb.present = "FALSE"' >> "${TMPCONFIG}"
+	else
+		cat >> "${TMPCONFIG}" <<-HEREEND
+		usb.present = "TRUE"
+		HEREEND
+	fi
 fi
+sed -i '/^usb\.generic\.autoconnect/Id' "${TMPCONFIG}"
+echo 'usb.generic.autoconnect = "TRUE"' >> "${TMPCONFIG}"
 
 # shared folders
 if [ "$HGFS_DISABLED" = "FALSE" ]; then
@@ -120,7 +124,7 @@ else
 fi
 
 # Disable DPI scaling information passing via vmware tools
-sed -i '/^gui.applyHostDisplayScaling/d' "${TMPCONFIG}"
+sed -i '/^gui.applyHostDisplayScaling/Id' "${TMPCONFIG}"
 echo 'gui.applyHostDisplayScalingToGuest = "FALSE"' >> "${TMPCONFIG}"
 
 # Additinal exam mode settings
@@ -168,10 +172,14 @@ fi
 #grep -qi '^vpmc\.enable' "${TMPCONFIG}" || echo 'vpmc.enable = "TRUE"' >> "${TMPCONFIG}"
 
 # Disable space check warnings
-sed -i '/^mainMem.freeSpaceCheck/d' "${TMPCONFIG}"
+sed -i '/^mainMem.freeSpaceCheck/Id' "${TMPCONFIG}"
 echo 'mainMem.freeSpaceCheck = "FALSE"' >> "${TMPCONFIG}"
 
 # At last_ Let's copy it to $confdir/run-vmware.conf
-cp -p "${TMPCONFIG}" "$conffile" && writelog "Copied TMPDIR/IMGUUID ${TMPCONFIG} to conffile ${conffile}" || \
-	( writelog "Could not copy TMPDIR/IMGUUID -${TMPCONFIG}- to conffile ${conffile}!"; cleanexit 1 )
+if cp -p "${TMPCONFIG}" "$conffile"; then
+	writelog "Copied TMPDIR/IMGUUID ${TMPCONFIG} to conffile ${conffile}"
+else
+	writelog "Could not copy TMPDIR/IMGUUID -${TMPCONFIG}- to conffile ${conffile}!"
+	cleanexit 1
+fi
 
-- 
cgit v1.2.3-55-g7522


From 4c2f9d060635e7c99e00a42eb2f0eb75c57a9b67 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 14 Sep 2016 14:05:46 +0200
Subject: [vmware] 4 CPU cores on win xp

---
 .../vmware/includes/create_vmware_config_file.inc          | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

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

diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmware_config_file.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmware_config_file.inc
index 9e0bfe4f..54af0dbc 100644
--- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmware_config_file.inc
+++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmware_config_file.inc
@@ -62,35 +62,37 @@ case "$vmostype" in
 	winnet*64|win*2003*64|windowsnet*64)
 		vmostype="winnetstandard-64"
 		MAXMEM="8000"
+		MAXCORES="8"
 	;;
 	winnet*|win*2003*|windowsnet*)
 		vmostype="winnetstandard"
 		MAXMEM="4000"
+		MAXCORES="8"
 	;;
 	winxphome*|windowsxphome*)
 		vmostype="winxphome"
 		MAXMEM="4000"
-		MAXCORES="1"
+		MAXCORES="2"
 	;;
 	winxp*64|windowsxp*64)
 		vmostype="winxppro-64"
 		MAXMEM="8000"
-		MAXCORES="2"
+		MAXCORES="8"
 	;;
 	winxp*|windowsxp*)
 		vmostype="winxppro"
 		MAXMEM="4000"
-		MAXCORES="1"
+		MAXCORES="4"
 	;;
 	winvista-64)
 		vmostype="winvista-64"
 		MAXMEM="16000"
-		MAXCORES="2"
+		MAXCORES="4"
 	;;
 	windows7-64)
 		vmostype="windows7-64"
 		MAXMEM="32000"
-		MAXCORES="4"
+		MAXCORES="8"
 	;;
 	windows8-64)
 		vmostype="windows8-64"
@@ -128,11 +130,13 @@ case "$vmostype" in
 	;;
 	win*)
 		MAXMEM="8000"
+		MAXCORES="1"
 	;;
 	dos|msdos*|ms-dos*)
 		vmostype="dos"
 		shfolders="FALSE"
 		MAXMEM="128"
+		MAXCORES="1"
 	;;
 	macos*64)
 		vmostype="freebsd-64"
-- 
cgit v1.2.3-55-g7522


From 0ab2253cc5896d1e63d9bb591b75d094dc254427 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 20 Sep 2016 19:06:21 +0200
Subject: [vmware] Force USB 2.0

---
 .../vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc  | 5 +++++
 1 file changed, 5 insertions(+)

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

diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc
index edbaeddc..974c9839 100644
--- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc
+++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc
@@ -75,6 +75,11 @@ if ! grep -q -i "^usb\.present" "${TMPCONFIG}"; then
 fi
 sed -i '/^usb\.generic\.autoconnect/Id' "${TMPCONFIG}"
 echo 'usb.generic.autoconnect = "TRUE"' >> "${TMPCONFIG}"
+# USB 3.0 support changes quality and has different side effects
+# with every minor release of vmware. Always force 2.0 for now.
+# TODO: Get it fixed by vmware?
+sed -i '/^ehci\.present/Id;/^usb_xhci\.present/Id' "${TMPCONFIG}"
+echo 'ehci.present = "TRUE"' >> "${TMPCONFIG}"
 
 # shared folders
 if [ "$HGFS_DISABLED" = "FALSE" ]; then
-- 
cgit v1.2.3-55-g7522


From 9346d24e07d9e988e08cc1447d1f4b150925a6f7 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 19 Oct 2016 12:07:04 +0200
Subject: [vmware/run-virt] Try to rename includes to what they actually do

---
 .../includes/create_static_directory_structure.inc |  23 +++
 .../includes/create_vmhome_preferences_file.inc    |   1 +
 .../vmware/includes/create_vmware_config_file.inc  | 190 ---------------------
 .../includes/determine_hardware_limitations.inc    | 185 ++++++++++++++++++++
 .../vmchooser/vmware/includes/parse_vmx.inc        | 182 --------------------
 .../vmware/includes/write_config_files.inc         |  29 ----
 .../vmchooser/vmware/includes/write_final_vmx.inc  | 189 ++++++++++++++++++++
 .../opt/openslx/vmchooser/vmware/run-virt.include  |  22 +--
 8 files changed, 410 insertions(+), 411 deletions(-)
 create mode 100644 remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_static_directory_structure.inc
 delete mode 100644 remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmware_config_file.inc
 create mode 100644 remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/determine_hardware_limitations.inc
 delete mode 100644 remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/write_config_files.inc
 create mode 100644 remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/write_final_vmx.inc

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

diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_static_directory_structure.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_static_directory_structure.inc
new file mode 100644
index 00000000..96363de3
--- /dev/null
+++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_static_directory_structure.inc
@@ -0,0 +1,23 @@
+###############################
+# Include: Write config files #
+###############################
+
+writelog "Redo directory: ${redodir}"
+writelog "Config directory: ${confdir}"
+writelog "Config file: ${conffile}"
+writelog "vmhome/dndlogs: ${vmhome}/dndlogs"
+
+# create vmware directories
+mkdir -p "$redodir" >/dev/null 2>&1
+mkdir -p "$confdir" >/dev/null 2>&1
+mkdir -p "$vmhome/dndlogs" >/dev/null 2>&1
+touch "$vmhome/dndlogs/dndlog.conf" >/dev/null 2>&1
+
+# link to conffile if confdir != redodir
+[ "$confdir" != "$redodir" ] && ln -s "$conffile" "$redodir/run-vmware.conf" >/dev/null 2>&1
+
+# own nvram. We need it for floppy drive b, default nvram has just drive a
+if ! cp "/opt/openslx/vmchooser/vmware/nvram" "$confdir/nvram"; then
+	slxlog "virt-vmware-nvram" "Could not copy nvram from '/opt/openslx/vmchooser/vmware/nvram' '$confdir/nvram'"
+fi
+
diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmhome_preferences_file.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmhome_preferences_file.inc
index b618041c..d50402f3 100644
--- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmhome_preferences_file.inc
+++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmhome_preferences_file.inc
@@ -68,4 +68,5 @@ create_vmhome_preferences_file() {
 		echo 'pref.hotkey.rightControl = "true"' >> "$vmhome/preferences"
 	fi
 	writelog "Vmware preferences file created in $vmhome."
+	true
 }
diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmware_config_file.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmware_config_file.inc
deleted file mode 100644
index 54af0dbc..00000000
--- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmware_config_file.inc
+++ /dev/null
@@ -1,190 +0,0 @@
-########################################
-# Include: Create vmware startup files #
-########################################
-
-writelog "Creating vmware configuration file: $conffile"
-
-MAXMEM="9999999"
-MAXCORES="4"
-shfolders="TRUE"
-sound="es1371"
-
-# define hardware configuration depending on the guest OS used
-# this needs to be fixed and is the base for the creation of new VMs
-case "$vmostype" in
-	win31*|windows31*)
-		vmostype="win31"
-		shfolders="FALSE"
-		sound="sb16"
-		MAXMEM="32"
-		MAXCORES="1"
-	;;
-	winnt*|windowsnt*)
-		vmostype="winnt"
-		shfolders="FALSE"
-		sound="sb16"
-		MAXMEM="1000"
-		MAXCORES="2"
-	;;
-	win95*|windows95*)
-		vmostype="win95"
-		shfolders="FALSE"
-		MAXMEM="96"
-		MAXCORES="1"
-	;;
-	win98*|windows98*)
-		vmostype="win98"
-		MAXMEM="256"
-		MAXCORES="1"
-	;;
-	winme*|windowsme*)
-		vmostype="winme"
-		MAXMEM="384"
-		MAXCORES="1"
-	;;
-	win2000|windows2000|win2000pro*)
-		vmostype="win2000pro"
-		MAXMEM="4000"
-		MAXCORES="2"
-	;;
-	win2000srv*|windows2000srv*|win2000serv*|windows2000serv*)
-		vmostype="win2000serv"
-		shfolders="FALSE"
-		MAXMEM="4000"
-		MAXCORES="4"
-	;;
-	win2000adv*|windows2000adv*|win2000dat*|windows2000dat*)
-		vmostype="win2000advserv"
-		shfolders="FALSE"
-		MAXMEM="8000"
-		MAXCORES="8"
-	;;
-	winnet*64|win*2003*64|windowsnet*64)
-		vmostype="winnetstandard-64"
-		MAXMEM="8000"
-		MAXCORES="8"
-	;;
-	winnet*|win*2003*|windowsnet*)
-		vmostype="winnetstandard"
-		MAXMEM="4000"
-		MAXCORES="8"
-	;;
-	winxphome*|windowsxphome*)
-		vmostype="winxphome"
-		MAXMEM="4000"
-		MAXCORES="2"
-	;;
-	winxp*64|windowsxp*64)
-		vmostype="winxppro-64"
-		MAXMEM="8000"
-		MAXCORES="8"
-	;;
-	winxp*|windowsxp*)
-		vmostype="winxppro"
-		MAXMEM="4000"
-		MAXCORES="4"
-	;;
-	winvista-64)
-		vmostype="winvista-64"
-		MAXMEM="16000"
-		MAXCORES="4"
-	;;
-	windows7-64)
-		vmostype="windows7-64"
-		MAXMEM="32000"
-		MAXCORES="8"
-	;;
-	windows8-64)
-		vmostype="windows8-64"
-		MAXMEM="32000"
-		MAXCORES="8"
-	;;
-	windows9-64)
-		vmostype="windows9-64"
-		MAXMEM="64000"
-		MAXCORES="8"
-	;;
-	winvista)
-		vmostype="winvista"
-		MAXMEM="8000"
-		MAXCORES="2"
-	;;
-	windows7)
-		vmostype="windows7"
-		MAXMEM="8000"
-		MAXCORES="4"
-	;;
-	windows8)
-		vmostype="windows8"
-		MAXMEM="8000"
-		MAXCORES="4"
-	;;
-	windows9)
-		vmostype="windows9"
-		MAXMEM="8000"
-		MAXCORES="4"
-	;;
-	win*64)
-		MAXMEM="16000"
-		MAXCORES="4"
-	;;
-	win*)
-		MAXMEM="8000"
-		MAXCORES="1"
-	;;
-	dos|msdos*|ms-dos*)
-		vmostype="dos"
-		shfolders="FALSE"
-		MAXMEM="128"
-		MAXCORES="1"
-	;;
-	macos*64)
-		vmostype="freebsd-64"
-		MAXMEM="4000"
-		MAXCORES="2"
-	;;
-	macos*)
-		vmostype="freebsd"
-		MAXMEM="4000"
-		MAXCORES="1"
-	;;
-	beos*)
-		vmostype="other"
-		shfolders="FALSE"
-	;;
-	# Unknown guestOS setting in .xml - this encompasses linux too,
-	# as there is a multitude of different distributions. Perhaps further
-	# action will be needed if this leads to problems with exotic OSs.
-	*64)
-		vmostype="other-64"
-		# shfolders="FALSE"
-		MAXMEM="123456"
-		MAXCORES="4"
-	;;
-	*)
-		vmostype="other"
-		# shfolders="FALSE"
-		MAXMEM="8000"
-		MAXCORES="1"
-	;;
-esac
-
-real_core_count="$cpu_cores"
-[ "$cpu_cores" -gt "$MAXCORES" ] && cpu_cores="$MAXCORES"
-
-# It currently makes no sense to set the virtual number of cores
-# to a different value than the virtual number of cores per virtual CPU.
-cores_per_socket="$cpu_cores"
-
-if [ "x$shfolders" != "xFALSE" ] && [ "$SHARE_REMAP_MODE" != 1 ]; then
-	HGFS_DISABLED="FALSE"
-else
-	HGFS_DISABLED="TRUE"
-fi
-
-[ "$mem" -ge "$MAXMEM" ] && mem="$MAXMEM"
-[ "$hwver" -lt "7" -a "$mem" -gt "3500" ] && mem="3500"
-
-# set the appropriate permissions for the vmware config file
-chmod u+rwx "${conffile}" >/dev/null 2>&1
-
diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/determine_hardware_limitations.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/determine_hardware_limitations.inc
new file mode 100644
index 00000000..84d959ea
--- /dev/null
+++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/determine_hardware_limitations.inc
@@ -0,0 +1,185 @@
+########################################
+# Include: Determine hw limitations depending on hwver and guest os #
+########################################
+
+MAXMEM="9999999"
+MAXCORES="4"
+shfolders="TRUE"
+sound="es1371"
+
+# define hardware configuration depending on the guest OS used
+# this needs to be fixed and is the base for the creation of new VMs
+case "$vmostype" in
+	win31*|windows31*)
+		vmostype="win31"
+		shfolders="FALSE"
+		sound="sb16"
+		MAXMEM="32"
+		MAXCORES="1"
+	;;
+	winnt*|windowsnt*)
+		vmostype="winnt"
+		shfolders="FALSE"
+		sound="sb16"
+		MAXMEM="1000"
+		MAXCORES="2"
+	;;
+	win95*|windows95*)
+		vmostype="win95"
+		shfolders="FALSE"
+		MAXMEM="96"
+		MAXCORES="1"
+	;;
+	win98*|windows98*)
+		vmostype="win98"
+		MAXMEM="256"
+		MAXCORES="1"
+	;;
+	winme*|windowsme*)
+		vmostype="winme"
+		MAXMEM="384"
+		MAXCORES="1"
+	;;
+	win2000|windows2000|win2000pro*)
+		vmostype="win2000pro"
+		MAXMEM="4000"
+		MAXCORES="2"
+	;;
+	win2000srv*|windows2000srv*|win2000serv*|windows2000serv*)
+		vmostype="win2000serv"
+		shfolders="FALSE"
+		MAXMEM="4000"
+		MAXCORES="4"
+	;;
+	win2000adv*|windows2000adv*|win2000dat*|windows2000dat*)
+		vmostype="win2000advserv"
+		shfolders="FALSE"
+		MAXMEM="8000"
+		MAXCORES="8"
+	;;
+	winnet*64|win*2003*64|windowsnet*64)
+		vmostype="winnetstandard-64"
+		MAXMEM="8000"
+		MAXCORES="8"
+	;;
+	winnet*|win*2003*|windowsnet*)
+		vmostype="winnetstandard"
+		MAXMEM="4000"
+		MAXCORES="8"
+	;;
+	winxphome*|windowsxphome*)
+		vmostype="winxphome"
+		MAXMEM="4000"
+		MAXCORES="2"
+	;;
+	winxp*64|windowsxp*64)
+		vmostype="winxppro-64"
+		MAXMEM="8000"
+		MAXCORES="8"
+	;;
+	winxp*|windowsxp*)
+		vmostype="winxppro"
+		MAXMEM="4000"
+		MAXCORES="4"
+	;;
+	winvista-64)
+		vmostype="winvista-64"
+		MAXMEM="16000"
+		MAXCORES="4"
+	;;
+	windows7-64)
+		vmostype="windows7-64"
+		MAXMEM="32000"
+		MAXCORES="8"
+	;;
+	windows8-64)
+		vmostype="windows8-64"
+		MAXMEM="32000"
+		MAXCORES="8"
+	;;
+	windows9-64)
+		vmostype="windows9-64"
+		MAXMEM="64000"
+		MAXCORES="8"
+	;;
+	winvista)
+		vmostype="winvista"
+		MAXMEM="8000"
+		MAXCORES="2"
+	;;
+	windows7)
+		vmostype="windows7"
+		MAXMEM="8000"
+		MAXCORES="4"
+	;;
+	windows8)
+		vmostype="windows8"
+		MAXMEM="8000"
+		MAXCORES="4"
+	;;
+	windows9)
+		vmostype="windows9"
+		MAXMEM="8000"
+		MAXCORES="4"
+	;;
+	win*64)
+		MAXMEM="16000"
+		MAXCORES="4"
+	;;
+	win*)
+		MAXMEM="8000"
+		MAXCORES="1"
+	;;
+	dos|msdos*|ms-dos*)
+		vmostype="dos"
+		shfolders="FALSE"
+		MAXMEM="128"
+		MAXCORES="1"
+	;;
+	macos*64)
+		vmostype="freebsd-64"
+		MAXMEM="4000"
+		MAXCORES="2"
+	;;
+	macos*)
+		vmostype="freebsd"
+		MAXMEM="4000"
+		MAXCORES="1"
+	;;
+	beos*)
+		vmostype="other"
+		shfolders="FALSE"
+	;;
+	# Unknown guestOS setting in .xml - this encompasses linux too,
+	# as there is a multitude of different distributions. Perhaps further
+	# action will be needed if this leads to problems with exotic OSs.
+	*64)
+		vmostype="other-64"
+		# shfolders="FALSE"
+		MAXMEM="123456"
+		MAXCORES="4"
+	;;
+	*)
+		vmostype="other"
+		# shfolders="FALSE"
+		MAXMEM="8000"
+		MAXCORES="1"
+	;;
+esac
+
+real_core_count="$cpu_cores"
+[ "$cpu_cores" -gt "$MAXCORES" ] && cpu_cores="$MAXCORES"
+
+# It currently makes no sense to set the virtual number of cores
+# to a different value than the virtual number of cores per virtual CPU.
+cores_per_socket="$cpu_cores"
+
+if [ "x$shfolders" != "xFALSE" ] && [ "$SHARE_REMAP_MODE" != 1 ]; then
+	HGFS_DISABLED="FALSE"
+else
+	HGFS_DISABLED="TRUE"
+fi
+
+[ "$mem" -ge "$MAXMEM" ] && mem="$MAXMEM"
+[ "$HWVER" -lt "7" -a "$mem" -gt "3500" ] && mem="3500"
+
diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc
index 974c9839..dec80e1d 100644
--- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc
+++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc
@@ -4,187 +4,5 @@
 
 writelog "Parsing virtual machine description file..."
 
-# check for vmdk file marker %VM_DISK_PATH% and put vmdk path in it's place: also VM_DISK_MODE
-# and VM_DISK_REDOLOGDIR.
-# IMAGE=$(grep -io '<image_path.*"' "${xmlfile}" | sed -e "s/&.*;/; /g" | awk -F '"' '{ print $2 }')
-sed -i 's#%VM_DISK_PATH%#'"$vm_diskfile"'#g' "${TMPCONFIG}"
-sed -i 's#%VM_DISK_MODE%#'"independent-nonpersistent"'#g' "${TMPCONFIG}"
-sed -i 's#%VM_DISK_REDOLOGDIR%#'"$redodir"'#g' "${TMPCONFIG}"
-
-# Ethernet: All we do is entering a generated MAC, as we do not want to interfere
-# in the possible case no networking is wanted.
-writelog "Guest MAC: $macaddr"
-echo 'ethernet0.addressType = "static"'		>> "${TMPCONFIG}"
-echo 'ethernet0.address = "'"${macaddr}"'"'	>> "${TMPCONFIG}"
-
-# DVD, CDROM
-# XXX: For now it's safe to assume ide channel 1 is free, as we support only one HDD, and if it's IDE, it's on channel 0
-cat >> "${TMPCONFIG}" <<-HEREEND
-ide1:0.present = "$cdrom0"
-ide1:0.autodetect = "TRUE"
-ide1:0.fileName = "auto detect"
-ide1:0.deviceType = "cdrom-raw"
-ide1:1.present = "$cdrom1"
-ide1:1.autodetect = "TRUE"
-ide1:1.fileName = "auto detect"
-ide1:1.deviceType = "cdrom-raw"
-HEREEND
-
-if [ -n "$FLOPPYIMG" ]; then
-	floppy1="TRUE"
-else
-	floppy1="FALSE"
-fi
-
-# Floppies:
-cat >> "${TMPCONFIG}" <<-HEREEND
-floppy0.present = "$floppy0"
-floppy0.startConnected = "FALSE"
-floppy0.autodetect = "TRUE"
-floppy0.fileName = "auto detect"
-floppy1.present = "$floppy1"
-floppy1.startConnected = "TRUE"
-floppy1.fileType = "file"
-floppy1.fileName = "$FLOPPYIMG"
-HEREEND
-
-writelog "numvcpus = ${cpu_cores} - maxvcpus=${real_core_count}"
-
-# RAM, CPUs
-cat >> "${TMPCONFIG}" <<-HEREEND
-numvcpus = "$cpu_cores"
-cpuid.coresPerSocket = "$cores_per_socket"
-maxvcpus = "$real_core_count"
-memsize = "$mem"
-MemAllowAutoScaleDown = "FALSE"
-MemTrimRate = "-1"
-HEREEND
-
-# USB fallback: Only write usb config if there's none
-if ! grep -q -i "^usb\.present" "${TMPCONFIG}"; then
-	# Nothing found, go ahead
-	if [ -n "$SLX_EXAM" ]; then
-		# Exam mode: Default to no USB
-		sed -i '/^usb\./Id' "${TMPCONFIG}"
-		echo 'usb.present = "FALSE"' >> "${TMPCONFIG}"
-	else
-		cat >> "${TMPCONFIG}" <<-HEREEND
-		usb.present = "TRUE"
-		HEREEND
-	fi
-fi
-sed -i '/^usb\.generic\.autoconnect/Id' "${TMPCONFIG}"
-echo 'usb.generic.autoconnect = "TRUE"' >> "${TMPCONFIG}"
-# USB 3.0 support changes quality and has different side effects
-# with every minor release of vmware. Always force 2.0 for now.
-# TODO: Get it fixed by vmware?
-sed -i '/^ehci\.present/Id;/^usb_xhci\.present/Id' "${TMPCONFIG}"
-echo 'ehci.present = "TRUE"' >> "${TMPCONFIG}"
-
-# shared folders
-if [ "$HGFS_DISABLED" = "FALSE" ]; then
-	cat >> "${TMPCONFIG}" <<-HEREEND
-	sharedFolder.option = "alwaysEnabled"
-	sharedFolder0.present = "$shfolders"
-	sharedFolder0.enabled = "$shfolders"
-	sharedFolder0.expiration = "never"
-	sharedFolder0.guestName = "$homesharename"
-	sharedFolder0.hostPath = "$homesharepath"
-	sharedFolder0.readAccess = "TRUE"
-	sharedFolder0.writeAccess = "TRUE"
-	sharedFolder1.present = "$shfolders"
-	sharedFolder1.enabled = "$shfolders"
-	sharedFolder1.expiration = "never"
-	sharedFolder1.guestName = "$commonsharename"
-	sharedFolder1.hostPath = "$commonsharepath"
-	sharedFolder1.readAccess = "TRUE"
-	sharedFolder1.writeAccess = "FALSE"
-	sharedFolder.maxNum = "2"
-	hgfs.mapRootShare = "TRUE"
-	hgfs.linkRootShare = "TRUE"
-	HEREEND
-fi
-
-# Isolation tools: settings
-cat >> "${TMPCONFIG}" <<-HEREEND
-isolation.tools.hgfs.disable = "$HGFS_DISABLED"
-isolation.tools.dnd.disable = "FALSE"
-isolation.tools.copy.enable = "TRUE"
-isolation.tools.paste.enabled = "TRUE"
-HEREEND
-
-# Serial, parallel: Empty, nothing is being currently set. TODO later.
-
-# Graphics, GPU: 3D will be enabled (even if vmware doesn't support the chip) if we whitelisted it.
-if [ -n "$SLX_VMWARE_3D" ]; then
-	writelog "FORCE3D set - overriding 3D in vmx file."
-	echo 'mks.gl.allowBlacklistedDrivers = "TRUE"'	>> "${TMPCONFIG}"
-	# We override... play safe and cap the hwVersion to 10, since some i915 chips goofed up with 12
-	# Investigate if we might have to do this in other cases where we don't override
-	if grep -qi '^mks.enable3d.*true' "${TMPCONFIG}"; then
-		vmw_cap_hw_version "10"
-	fi
-else
-	writelog "FORCE3D not set - 3D will only work if GPU/driver is whitelisted by vmware."
-fi
-
-# Disable DPI scaling information passing via vmware tools
-sed -i '/^gui.applyHostDisplayScaling/Id' "${TMPCONFIG}"
-echo 'gui.applyHostDisplayScalingToGuest = "FALSE"' >> "${TMPCONFIG}"
-
-# Additinal exam mode settings
-if [ -n "$SLX_EXAM" ]; then
-	echo 'gui.restricted = "true"' >> "${TMPCONFIG}"
-fi
-
-# Hack resolution if we know the desired one is not in the default list of vmx_svga
-# For now, only do it on the odd ones, as we don't know if this has any side effects
-# This seems unnecessary on Win7 but is required on WinXP - need more research for other OSs
-case "$RESOLUTION" in
-	1600x900|2560x1440|2880x1800|3200x1800)
-		X=${RESOLUTION%x*}
-		Y=${RESOLUTION#*x}
-		BYTES=$(( ( ( X * Y * 4  + 65535 ) / 65536 ) * 65536 ))
-		[ "$BYTES" -lt 16777216 ] && BYTES=16777216
-		cat >> "${TMPCONFIG}" <<-EOF
-		svga.autodetect = "FALSE"
-		svga.vramSize = $BYTES
-		svga.maxWidth = $X
-		svga.maxHeight = $Y
-		EOF
-		;;
-esac
-
-# Killing duplicate lines (output much nicer than sort -u):
-awk '!a[$0]++' "${TMPCONFIG}" > "${TMPCONFIG}.tmp" && mv -f "${TMPCONFIG}.tmp" "${TMPCONFIG}"
-
-# Apply $maxhardwareversion to final VMX
 HWVER=$(grep -i -m1 '^virtualHW.version *= *' "${TMPCONFIG}" | awk -F '=' '{print $2}' | sed -r 's/[^0-9]//g')
-if [ -n "$HWVER" ] && [ "$HWVER" -gt "$maxhardwareversion" ]; then
-	writelog "Hardware version capped to $maxhardwareversion (was $HWVER)"
-	sed -i 's/^virtualHW\.version.*$/virtualHW.version = "'$maxhardwareversion'"/I' "${TMPCONFIG}"
-	HWVER="$maxhardwareversion"
-fi
-
-# Enable nested virtualization if not specified in remote vmx
-if [ -e "/run/hwinfo" ] && ! grep -qi '^vhv\.enable' "${TMPCONFIG}" \
-		&& grep -qE '^flags\s*:.*\b(ept|npt)\b' "/proc/cpuinfo" \
-		&& [ "$HWVER" -ge "9" ]; then
-	. "/run/hwinfo"
-	[ "${HW_KVM}" = "ENABLED" ] && echo 'vhv.enable = "TRUE"' >> "${TMPCONFIG}"
-fi
-# TODO: Need a way to check if supported by hardware before enabling!
-#grep -qi '^vpmc\.enable' "${TMPCONFIG}" || echo 'vpmc.enable = "TRUE"' >> "${TMPCONFIG}"
-
-# Disable space check warnings
-sed -i '/^mainMem.freeSpaceCheck/Id' "${TMPCONFIG}"
-echo 'mainMem.freeSpaceCheck = "FALSE"' >> "${TMPCONFIG}"
-
-# At last_ Let's copy it to $confdir/run-vmware.conf
-if cp -p "${TMPCONFIG}" "$conffile"; then
-	writelog "Copied TMPDIR/IMGUUID ${TMPCONFIG} to conffile ${conffile}"
-else
-	writelog "Could not copy TMPDIR/IMGUUID -${TMPCONFIG}- to conffile ${conffile}!"
-	cleanexit 1
-fi
 
diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/write_config_files.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/write_config_files.inc
deleted file mode 100644
index 555688bf..00000000
--- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/write_config_files.inc
+++ /dev/null
@@ -1,29 +0,0 @@
-###############################
-# Include: Write config files #
-###############################
-
-writelog "Redo directory: ${redodir}"
-writelog "Config directory: ${confdir}"
-writelog "Config file: ${conffile}"
-writelog "vmhome/dndlogs: ${vmhome}/dndlogs"
-
-# create vmware directories
-mkdir -p "$redodir" >/dev/null 2>&1
-mkdir -p "$confdir" >/dev/null 2>&1
-mkdir -p "$vmhome/dndlogs" >/dev/null 2>&1
-touch "$vmhome/dndlogs/dndlog.conf" >/dev/null 2>&1
-
-# create preferences file ${vmhome}/preferences
-source "${VMWAREINCLUDEDIR}/create_vmhome_preferences_file.inc" && create_vmhome_preferences_file
-
-# create VMware config file (conffile)
-source "${VMWAREINCLUDEDIR}/create_vmware_config_file.inc"
-
-# link to conffile if confdir != redodir
-[ "$confdir" != "$redodir" ] && ln -s "$conffile" "$redodir/run-vmware.conf" >/dev/null 2>&1
-
-# own nvram. We need it for floppy drive b, default nvram has just drive a
-if ! cp "/opt/openslx/vmchooser/vmware/nvram" "$confdir/nvram"; then
-	slxlog "virt-vmware-nvram" "Could not copy nvram from '/opt/openslx/vmchooser/vmware/nvram' '$confdir/nvram'"
-fi
-
diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/write_final_vmx.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/write_final_vmx.inc
new file mode 100644
index 00000000..41548154
--- /dev/null
+++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/write_final_vmx.inc
@@ -0,0 +1,189 @@
+
+# check for vmdk file marker %VM_DISK_PATH% and put vmdk path in it's place: also VM_DISK_MODE
+# and VM_DISK_REDOLOGDIR.
+sed -i 's#%VM_DISK_PATH%#'"$vm_diskfile"'#g' "${TMPCONFIG}"
+sed -i 's#%VM_DISK_MODE%#'"independent-nonpersistent"'#g' "${TMPCONFIG}"
+sed -i 's#%VM_DISK_REDOLOGDIR%#'"$redodir"'#g' "${TMPCONFIG}"
+
+# Ethernet: All we do is entering a generated MAC, as we do not want to interfere
+# in the possible case no networking is wanted.
+writelog "Guest MAC: $macaddr"
+echo 'ethernet0.addressType = "static"'		>> "${TMPCONFIG}"
+echo 'ethernet0.address = "'"${macaddr}"'"'	>> "${TMPCONFIG}"
+
+# DVD, CDROM
+# XXX: For now it's safe to assume ide channel 1 is free, as we support only one HDD, and if it's IDE, it's on channel 0
+cat >> "${TMPCONFIG}" <<-HEREEND
+ide1:0.present = "$cdrom0"
+ide1:0.autodetect = "TRUE"
+ide1:0.fileName = "auto detect"
+ide1:0.deviceType = "cdrom-raw"
+ide1:1.present = "$cdrom1"
+ide1:1.autodetect = "TRUE"
+ide1:1.fileName = "auto detect"
+ide1:1.deviceType = "cdrom-raw"
+HEREEND
+
+if [ -n "$FLOPPYIMG" ]; then
+	floppy1="TRUE"
+else
+	floppy1="FALSE"
+fi
+
+# Floppies:
+cat >> "${TMPCONFIG}" <<-HEREEND
+floppy0.present = "$floppy0"
+floppy0.startConnected = "FALSE"
+floppy0.autodetect = "TRUE"
+floppy0.fileName = "auto detect"
+floppy1.present = "$floppy1"
+floppy1.startConnected = "TRUE"
+floppy1.fileType = "file"
+floppy1.fileName = "$FLOPPYIMG"
+HEREEND
+
+writelog "numvcpus = ${cpu_cores} - maxvcpus=${real_core_count}"
+
+# RAM, CPUs
+cat >> "${TMPCONFIG}" <<-HEREEND
+numvcpus = "$cpu_cores"
+cpuid.coresPerSocket = "$cores_per_socket"
+maxvcpus = "$real_core_count"
+memsize = "$mem"
+MemAllowAutoScaleDown = "FALSE"
+MemTrimRate = "-1"
+HEREEND
+
+# USB fallback: Only write usb config if there's none
+if ! grep -q -i "^usb\.present" "${TMPCONFIG}"; then
+	# Nothing found, go ahead
+	if [ -n "$SLX_EXAM" ]; then
+		# Exam mode: Default to no USB
+		sed -i '/^usb\./Id' "${TMPCONFIG}"
+		echo 'usb.present = "FALSE"' >> "${TMPCONFIG}"
+	else
+		cat >> "${TMPCONFIG}" <<-HEREEND
+		usb.present = "TRUE"
+		HEREEND
+	fi
+fi
+sed -i '/^usb\.generic\.autoconnect/Id' "${TMPCONFIG}"
+echo 'usb.generic.autoconnect = "TRUE"' >> "${TMPCONFIG}"
+# USB 3.0 support changes quality and has different side effects
+# with every minor release of vmware. Always force 2.0 for now.
+# TODO: Get it fixed by vmware?
+sed -i '/^ehci\.present/Id;/^usb_xhci\.present/Id' "${TMPCONFIG}"
+echo 'ehci.present = "TRUE"' >> "${TMPCONFIG}"
+
+# shared folders
+if [ "$HGFS_DISABLED" = "FALSE" ]; then
+	cat >> "${TMPCONFIG}" <<-HEREEND
+	sharedFolder.option = "alwaysEnabled"
+	sharedFolder0.present = "$shfolders"
+	sharedFolder0.enabled = "$shfolders"
+	sharedFolder0.expiration = "never"
+	sharedFolder0.guestName = "$homesharename"
+	sharedFolder0.hostPath = "$homesharepath"
+	sharedFolder0.readAccess = "TRUE"
+	sharedFolder0.writeAccess = "TRUE"
+	sharedFolder1.present = "$shfolders"
+	sharedFolder1.enabled = "$shfolders"
+	sharedFolder1.expiration = "never"
+	sharedFolder1.guestName = "$commonsharename"
+	sharedFolder1.hostPath = "$commonsharepath"
+	sharedFolder1.readAccess = "TRUE"
+	sharedFolder1.writeAccess = "FALSE"
+	sharedFolder.maxNum = "2"
+	hgfs.mapRootShare = "TRUE"
+	hgfs.linkRootShare = "TRUE"
+	HEREEND
+fi
+
+# Isolation tools: settings
+cat >> "${TMPCONFIG}" <<-HEREEND
+isolation.tools.hgfs.disable = "$HGFS_DISABLED"
+isolation.tools.dnd.disable = "FALSE"
+isolation.tools.copy.enable = "TRUE"
+isolation.tools.paste.enabled = "TRUE"
+HEREEND
+
+# Serial, parallel: Empty, nothing is being currently set. TODO later.
+
+# Graphics, GPU: 3D will be enabled (even if vmware doesn't support the chip) if we whitelisted it.
+if [ -n "$SLX_VMWARE_3D" ]; then
+	writelog "FORCE3D set - overriding 3D in vmx file."
+	echo 'mks.gl.allowBlacklistedDrivers = "TRUE"'	>> "${TMPCONFIG}"
+	# We override... play safe and cap the hwVersion to 10, since some i915 chips goofed up with 12
+	# Investigate if we might have to do this in other cases where we don't override
+	if grep -qi '^mks.enable3d.*true' "${TMPCONFIG}"; then
+		vmw_cap_hw_version "10"
+	fi
+else
+	writelog "FORCE3D not set - 3D will only work if GPU/driver is whitelisted by vmware."
+fi
+
+# Disable DPI scaling information passing via vmware tools
+sed -i '/^gui.applyHostDisplayScaling/Id' "${TMPCONFIG}"
+echo 'gui.applyHostDisplayScalingToGuest = "FALSE"' >> "${TMPCONFIG}"
+
+# Additinal exam mode settings
+if [ -n "$SLX_EXAM" ]; then
+	echo 'gui.restricted = "true"' >> "${TMPCONFIG}"
+fi
+
+# Hack resolution if we know the desired one is not in the default list of vmx_svga
+# For now, only do it on the odd ones, as we don't know if this has any side effects
+# This seems unnecessary on Win7 but is required on WinXP - need more research for other OSs
+case "$RESOLUTION" in
+	1600x900|2560x1440|2880x1800|3200x1800)
+		X=${RESOLUTION%x*}
+		Y=${RESOLUTION#*x}
+		BYTES=$(( ( ( X * Y * 4  + 65535 ) / 65536 ) * 65536 ))
+		[ "$BYTES" -lt 16777216 ] && BYTES=16777216
+		cat >> "${TMPCONFIG}" <<-EOF
+		svga.autodetect = "FALSE"
+		svga.vramSize = $BYTES
+		svga.maxWidth = $X
+		svga.maxHeight = $Y
+		EOF
+		;;
+esac
+
+# Killing duplicate lines (output much nicer than sort -u):
+awk '!a[$0]++' "${TMPCONFIG}" > "${TMPCONFIG}.tmp" && mv -f "${TMPCONFIG}.tmp" "${TMPCONFIG}"
+
+# Apply $maxhardwareversion to final VMX
+if [ -n "$HWVER" ] && [ "$HWVER" -gt "$maxhardwareversion" ]; then
+	writelog "Hardware version capped to $maxhardwareversion (was $HWVER)"
+	sed -i 's/^virtualHW\.version.*$/virtualHW.version = "'$maxhardwareversion'"/I' "${TMPCONFIG}"
+	HWVER="$maxhardwareversion"
+fi
+
+# Enable nested virtualization if not specified in remote vmx
+if [ -e "/run/hwinfo" ] && ! grep -qi '^vhv\.enable' "${TMPCONFIG}" \
+		&& grep -qE '^flags\s*:.*\b(ept|npt)\b' "/proc/cpuinfo" \
+		&& [ "$HWVER" -ge "9" ]; then
+	. "/run/hwinfo"
+	[ "${HW_KVM}" = "ENABLED" ] && echo 'vhv.enable = "TRUE"' >> "${TMPCONFIG}"
+fi
+# TODO: Need a way to check if supported by hardware before enabling!
+#grep -qi '^vpmc\.enable' "${TMPCONFIG}" || echo 'vpmc.enable = "TRUE"' >> "${TMPCONFIG}"
+
+# Disable space check warnings
+sed -i '/^mainMem.freeSpaceCheck/Id' "${TMPCONFIG}"
+echo 'mainMem.freeSpaceCheck = "FALSE"' >> "${TMPCONFIG}"
+
+# See if there are any USB devices connected that we want to pass through immediately
+get_usb_devices 'usb.autoConnect.deviceXXXXX = "0x%VENDOR%:0x%PRODUCT%"' \
+	| sed -r 's/0x0+/0x/g' \
+	| awk '{sub(/XXXXX/,NR-1)}1' \
+	>> "${TMPCONFIG}"
+
+# At last_ Let's copy it to $confdir/run-vmware.conf
+if cp -p "${TMPCONFIG}" "$conffile"; then
+	writelog "Copied TMPDIR/IMGUUID ${TMPCONFIG} to conffile ${conffile}"
+else
+	writelog "Could not copy TMPDIR/IMGUUID -${TMPCONFIG}- to conffile ${conffile}!"
+	cleanexit 1
+fi
+
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 4d263272..08188b58 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
@@ -42,24 +42,26 @@ if [ "$LEGACY" ]; then
 	#	set_vmware_startup_file
 	source "${VMWAREINCLUDEDIR}/write_config_files_legacy.inc" && write_config_files_legacy
 else
-	# write configuration files
-	source "${VMWAREINCLUDEDIR}/write_config_files.inc"
+	# get information from downloaded vmx
+	source "${VMWAREINCLUDEDIR}/parse_vmx.inc"
+
+	# determine limitations wrt RAM and CPU count of VM
+	source "${VMWAREINCLUDEDIR}/determine_hardware_limitations.inc"
+
+	# create file and directory structure for vmware setup
+	source "${VMWAREINCLUDEDIR}/create_static_directory_structure.inc"
+
+	# create preferences file ${vmhome}/preferences
+	source "${VMWAREINCLUDEDIR}/create_vmhome_preferences_file.inc" && create_vmhome_preferences_file
 
 	# parse the given vmx file
-	source "${VMWAREINCLUDEDIR}/parse_vmx.inc"
+	source "${VMWAREINCLUDEDIR}/write_final_vmx.inc"
 fi
 
 # logging and stdout
 # needs writelog() from vmchooser-run_virt
 source "${VMWAREINCLUDEDIR}/logging.inc" && logging
 
-# See if there are any USB devices connected that we want to pass through immediately
-get_usb_devices 'usb.autoConnect.deviceXXXXX = "0x%VENDOR%:0x%PRODUCT%"' \
-	| sed -r 's/0x0+/0x/g' \
-	| awk '{sub(/XXXXX/,NR-1)}1' \
-	>> "$conffile"
-
-
 # For debugging
 cp "$conffile" "/tmp/vmware-last-config"
 
-- 
cgit v1.2.3-55-g7522


From 7c70ebde186c9589bd6e56f04d9f9bab682a3c14 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 19 Oct 2016 15:07:25 +0200
Subject: [run-virt] More cleanup; kill legacy support, rename and move
 includes, kill dead code

---
 .../data/opt/openslx/scripts/includes/TEST.sh      |   6 -
 .../opt/openslx/scripts/includes/check_lpd.inc     |  13 -
 .../includes/check_runvirt_needed_files.inc        |  53 ----
 .../includes/check_runvirt_xml_sanity_legacy.inc   |  26 --
 .../opt/openslx/scripts/includes/detect_legacy.inc |  34 ---
 .../scripts/includes/get_xml_file_dir_legacy.inc   |  50 ----
 .../scripts/includes/get_xml_file_variables.inc    | 103 -------
 .../includes/get_xml_file_variables_legacy.inc     | 120 --------
 .../includes/print_runvirt_console_logo.inc        |  12 -
 .../includes/set_runvirt_hardware_variables.inc    | 102 -------
 .../set_runvirt_hardware_variables_legacy.inc      |  87 ------
 .../scripts/includes/set_runvirt_variables.inc     |  26 --
 .../openslx/scripts/includes/setup_firewall.inc    |  12 -
 .../scripts/includes/setup_image_access.inc        |  71 -----
 .../openslx/scripts/includes/setup_printer_lpd.inc |  33 ---
 .../opt/openslx/scripts/includes/setup_sound.inc   |  64 -----
 .../scripts/includes/setup_virtual_floppy.inc      | 101 -------
 .../scripts/includes/setup_vm_hypervisor.inc       |  22 --
 .../scripts/includes/start_windowmanager.inc       |  27 --
 .../opt/openslx/scripts/includes/usb_detector.inc  |  77 -----
 .../includes/vmchooser_runvirt_functions.inc       |  76 -----
 .../data/opt/openslx/scripts/vmchooser-run_virt    | 116 +-------
 .../check_runvirt_needed_files.inc                 |  53 ++++
 .../vmchooser/run-virt-includes/detect_legacy.inc  |  34 +++
 .../run-virt-includes/get_xml_file_variables.inc   | 103 +++++++
 .../set_runvirt_hardware_variables.inc             | 102 +++++++
 .../run-virt-includes/set_runvirt_variables.inc    |  26 ++
 .../vmchooser/run-virt-includes/setup_firewall.inc |  12 +
 .../run-virt-includes/setup_image_access.inc       |  71 +++++
 .../run-virt-includes/setup_printer_lpd.inc        |  46 +++
 .../vmchooser/run-virt-includes/setup_sound.inc    |  65 +++++
 .../run-virt-includes/setup_virtual_floppy.inc     | 101 +++++++
 .../run-virt-includes/setup_vm_hypervisor.inc      |  34 +++
 .../run-virt-includes/start_windowmanager.inc      |  27 ++
 .../vmchooser/run-virt-includes/usb_detector.inc   |  77 +++++
 .../vmchooser_runvirt_functions.inc                |  79 ++++++
 .../data/opt/openslx/vmchooser/vmchooser-run_virt  | 116 ++++++++
 .../includes/create_vmware_config_file_legacy.inc  | 316 ---------------------
 .../vmware/includes/log_config_summary.inc         |  62 ++++
 .../openslx/vmchooser/vmware/includes/logging.inc  |  64 -----
 .../vmware/includes/set_hardware_legacy.inc        | 152 ----------
 .../vmware/includes/write_config_files_legacy.inc  |  29 --
 .../opt/openslx/vmchooser/vmware/run-virt.include  |  35 +--
 43 files changed, 1021 insertions(+), 1814 deletions(-)
 delete mode 100755 remote/modules/run-virt/data/opt/openslx/scripts/includes/TEST.sh
 delete mode 100644 remote/modules/run-virt/data/opt/openslx/scripts/includes/check_lpd.inc
 delete mode 100644 remote/modules/run-virt/data/opt/openslx/scripts/includes/check_runvirt_needed_files.inc
 delete mode 100644 remote/modules/run-virt/data/opt/openslx/scripts/includes/check_runvirt_xml_sanity_legacy.inc
 delete mode 100644 remote/modules/run-virt/data/opt/openslx/scripts/includes/detect_legacy.inc
 delete mode 100644 remote/modules/run-virt/data/opt/openslx/scripts/includes/get_xml_file_dir_legacy.inc
 delete mode 100644 remote/modules/run-virt/data/opt/openslx/scripts/includes/get_xml_file_variables.inc
 delete mode 100644 remote/modules/run-virt/data/opt/openslx/scripts/includes/get_xml_file_variables_legacy.inc
 delete mode 100644 remote/modules/run-virt/data/opt/openslx/scripts/includes/print_runvirt_console_logo.inc
 delete mode 100644 remote/modules/run-virt/data/opt/openslx/scripts/includes/set_runvirt_hardware_variables.inc
 delete mode 100644 remote/modules/run-virt/data/opt/openslx/scripts/includes/set_runvirt_hardware_variables_legacy.inc
 delete mode 100644 remote/modules/run-virt/data/opt/openslx/scripts/includes/set_runvirt_variables.inc
 delete mode 100644 remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_firewall.inc
 delete mode 100644 remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_image_access.inc
 delete mode 100644 remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_printer_lpd.inc
 delete mode 100644 remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_sound.inc
 delete mode 100644 remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_virtual_floppy.inc
 delete mode 100644 remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_vm_hypervisor.inc
 delete mode 100644 remote/modules/run-virt/data/opt/openslx/scripts/includes/start_windowmanager.inc
 delete mode 100644 remote/modules/run-virt/data/opt/openslx/scripts/includes/usb_detector.inc
 delete mode 100644 remote/modules/run-virt/data/opt/openslx/scripts/includes/vmchooser_runvirt_functions.inc
 mode change 100755 => 120000 remote/modules/run-virt/data/opt/openslx/scripts/vmchooser-run_virt
 create mode 100644 remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/check_runvirt_needed_files.inc
 create mode 100644 remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/detect_legacy.inc
 create mode 100644 remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/get_xml_file_variables.inc
 create mode 100644 remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/set_runvirt_hardware_variables.inc
 create mode 100644 remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/set_runvirt_variables.inc
 create mode 100644 remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_firewall.inc
 create mode 100644 remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_image_access.inc
 create mode 100644 remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_printer_lpd.inc
 create mode 100644 remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_sound.inc
 create mode 100644 remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_virtual_floppy.inc
 create mode 100644 remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_vm_hypervisor.inc
 create mode 100644 remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/start_windowmanager.inc
 create mode 100644 remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/usb_detector.inc
 create mode 100644 remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/vmchooser_runvirt_functions.inc
 create mode 100755 remote/modules/run-virt/data/opt/openslx/vmchooser/vmchooser-run_virt
 delete mode 100644 remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmware_config_file_legacy.inc
 create mode 100644 remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/log_config_summary.inc
 delete mode 100644 remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/logging.inc
 delete mode 100644 remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/set_hardware_legacy.inc
 delete mode 100644 remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/write_config_files_legacy.inc

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

diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/includes/TEST.sh b/remote/modules/run-virt/data/opt/openslx/scripts/includes/TEST.sh
deleted file mode 100755
index fd5f755d..00000000
--- a/remote/modules/run-virt/data/opt/openslx/scripts/includes/TEST.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-. usb_detector.inc
-
-get_usb_devices "bla=%VENDOR% kacke=%PRODUCT%" 0:6 0:7 0:e 0:10
-
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/includes/check_lpd.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/check_lpd.inc
deleted file mode 100644
index cfaf811e..00000000
--- a/remote/modules/run-virt/data/opt/openslx/scripts/includes/check_lpd.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-############################################
-# Include: Checking whether lpd is running #
-############################################
-
-# Check if tcpsvd is running. Do this down here so we do not check
-# immediately after trying to spawn it, as this could result in
-# success even if it's not really working.
-
-if ! kill -0 "$PID_LPD"; then
-	slxlog "virt-lpd" "Could not start tcpsvd/lpd for virtual machine session"
-	notify_user "Durcksystem" "Das Drucksystem konnte nicht initialisiert werden. Druckfunktion nicht verfügbar."
-fi
-
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/includes/check_runvirt_needed_files.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/check_runvirt_needed_files.inc
deleted file mode 100644
index fbb0bc70..00000000
--- a/remote/modules/run-virt/data/opt/openslx/scripts/includes/check_runvirt_needed_files.inc
+++ /dev/null
@@ -1,53 +0,0 @@
-#################################################################
-# Include: Check for important files used by vmchooser_run-virt #
-#################################################################
-
-# WARNING: This is perhaps vestigial!
-
-filecheck() {
-        filecheck=$(LANG=us ls -lh ${diskfile} 2>&1)
-        writelog "Filecheck:\n${filecheck}\n"
-        noimage=$(echo ${filecheck} | grep -i "no such file or directory" | wc -l)
-        rightsfile=${diskfile}
-
-        # check if link
-        if [ -L "${diskfile}" ]; then
-                # take link target
-                rightsfile=$(ls -lh ${diskfile} 2>&1 | awk -F '-> *' '{print $2}')
-                rightsfile=${vmdir}/${rightsfile}
-                filecheck=$(LANG=us ls -lh ${rightsfile} 2>&1)
-        fi
-
-        # does file exist
-        if [ "${noimage}" -ge "1" ]; then
-                writelog "Virtual Machine Image Problem:\c "
-                writelog "\tThe image you've specified doesn't exist."
-                writelog "Filecheck says:\c "
-                writelog "\t\t${diskfile}:\n\t\t\tNo such file or directory"
-                writelog "Hint:\c "
-                writelog "\t\t\tCompare spelling of the image with your options.\n"
-                exit 1
-        fi
-        # readable by calling user
-        if ! [ -r "${diskfile}" >/dev/null 2>&1 \
-                -o -r "${diskfile}" >/dev/null 2>&1 ]; then
-                writelog "Vmware Image Problem:\c "
-                writelog "\tThe image you've specified has wrong rights."
-                writelog "Filecheck says:\t\t$(echo ${filecheck} \
-                | awk '{print $1" "$3" "$4}') ${rightsfile}"
-                writelog "Hint:\t\t\tChange rights with: chmod a+r ${rightsfile}\n"
-                exit 1
-        fi
-
-        # writable (for persistent-mode)?
-        if ! [ -w "${diskfile}" >/dev/null 2>&1 \
-        -o -w "${diskfile}" >/dev/null 2>&1 ] \
-        && [ "${np}" = "independent-persistent" ]; then
-                writelog "Vmware Image Problem:\c "
-                writelog "\tThe image you have specified has wrong rights."
-                writelog "Filecheck says:\t\t$(echo ${filecheck} \
-                | awk '{print $1" "$3" "$4}') ${rightsfile}"
-                writelog "Hint:\t\t\tUse nonpersistent-mode or change rights to rw\n"
-                exit 1
-        fi
-}
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/includes/check_runvirt_xml_sanity_legacy.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/check_runvirt_xml_sanity_legacy.inc
deleted file mode 100644
index 0e720a06..00000000
--- a/remote/modules/run-virt/data/opt/openslx/scripts/includes/check_runvirt_xml_sanity_legacy.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-#######################################################
-# Include: check xml file for sanity (legacy, old way #
-#######################################################
-
-# test if the xml file is valid
-if ! [ -r "${xmlfile}" ]; then
-	writelog "${xmlfile} not a readable XML file!"
-	slxlog "virt-nonreadable-xml" "XML file not readable: $xmlfile"
-	error_user "Die XML-Datei der gewählten Sitzung ist nicht lesbar oder existiert nicht"
-	exit 1
-fi
-
-# test if XML file
-if ! grep -q '<?xml' "${xmlfile}"; then
-	writelog "Submitted configuration file ${xmlfile} seems to have wrong XML format"
-	slxlog "virt-invalid-xml" "Malformed XML file: $xmlfile" "$xmlfile"
-	error_user "Die XML-Datei der gewählten Sitzung hat ein ungültiges Format"
-	exit 1
-fi
-
-# check for running in graphical environment otherwise no much use here
-if [ -z "$DISPLAY" ]; then
-	writelog -e "\n\tStart only within a graphical desktop!\n"
-	exit 1
-fi
-
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/includes/detect_legacy.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/detect_legacy.inc
deleted file mode 100644
index 8bdfd8b1..00000000
--- a/remote/modules/run-virt/data/opt/openslx/scripts/includes/detect_legacy.inc
+++ /dev/null
@@ -1,34 +0,0 @@
-########################################################
-# Include: Detect, whether runvirt runs in legacy mode #
-########################################################
-
-# Legacy mode: As runvirt has been before.
-# New mode: uuid in xml _and_ vmx given via http.
-
-writelog "Detecting current/legacy mode ..."
-
-# First, let's try to extract an imguuid from xmlfile:
-declare -rg IMGUUID=$(grep -i -o '<uuid param=.*"' "${xmlfile}" | sed -e "s/&.*;/; /g" | awk -F '"' '{ print $2 }')
-declare -rg TMPCONFIG="$TMPDIR/vmconfig.tmp"
-
-writelog "IMGUUID extracted: $IMGUUID"
-
-# Assume legacy mode by default, only trigger "current" mode if everything else below worked
-LEGACY=yes
-if [ -z "$IMGUUID" ]; then	# Keine uuid: Abbruch, Legacy
-	writelog "Could not extract a uuid param from ${xmlfile}. Triggering legacy mode."
-else
-	# Now getting template file:
-	if ! wget -T 6 -O "$TMPCONFIG" "${SLX_VMCHOOSER_BASE_URL}/lecture/${IMGUUID}" 2>/dev/null >&2; then
-		writelog "wget ${SLX_VMCHOOSER_BASE_URL}/lecture/${IMGUUID}. Triggering legacy mode."
-	else
-		writelog "wget ${SLX_VMCHOOSER_BASE_URL}/lecture/${IMGUUID} successful."
-		if [ ! -s "$TMPCONFIG" ]; then
-			writelog "Server sent zero byte virtual machine description file. Triggering legacy mode."
-		else
-			writelog "Triggering current (non-legacy) mode."
-			LEGACY=		# everything worked - clear legacy mode variable (so we use the "current" mode)
-		fi
-	fi
-fi
-
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/includes/get_xml_file_dir_legacy.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/get_xml_file_dir_legacy.inc
deleted file mode 100644
index c3c6f7b3..00000000
--- a/remote/modules/run-virt/data/opt/openslx/scripts/includes/get_xml_file_dir_legacy.inc
+++ /dev/null
@@ -1,50 +0,0 @@
-#########################################################
-# Include: Get xml file and directory (legacy, old way) #
-#########################################################
-
-## Added for persistent support.
-diskmode='nonpersistent'
-if [[ "$(grep --extended-regexp \
-		'< *short_description *param=".+ --persistent--"' "$1")" ]]; then
-	diskmode='persistent'
-	imageFilePath="$(grep -io '<image_path param=.*"' "$1" | sed -e "s/&.*;/; /g" | awk -F '"' '{ print $2 }')"
-	[ -z "$imageFilePath" ] && imageFilePath="$(grep -io '<image_name param=.*"' "$1" | sed -e "s/&.*;/; /g" | awk -F '"' '{ print $2 }')"
-	originalXMLFilePath="$(grep -io '<original_xml_file_path param=.*"' "$1" \
-		| sed -e "s/&.*;/; /g" | awk -F '"' '{ print $2 }')"
-	originalImageFileName="$(grep -io '<image_name param=.*"' \
-		"$originalXMLFilePath" | sed -e "s/&.*;/; /g" | awk -F '"' \
-		'{ print $2 }')"
-	originalVMDKFilePath="$(dirname \
-		"$originalXMLFilePath")/${originalImageFileName}"
-	# Added to workaround path prefix coming from temporary generated xml file
-	# by vmchooser.
-	if [[ "$(grep --extended-regexp '^/tmp/tmp\.[^\/]+/' <<< \
-		"$imageFilePath")" ]]; then
-		imageFilePath=$(sed -r 's/^\/?tmp\/[^\/]+\///g' \
-		<<< "$imageFilePath")
-	sed -ir \
-		"s/(<image_name param=\")[^\"]*(\")/\\1$(sed -e \
-		's/\\/\\\\/g' -e 's/\//\\\//g' -e \
-		's/&/\\\&/g' <<< "$imageFilePath")\\2/g" "$1"
-	fi
-	# Create linked clone if not exists.
-	if [ ! -f "$imageFilePath" ]; then
-		mkdir -p "$(dirname "$imageFilePath")" && \
-		bash "$(dirname "$0")/vmchooser-clc" "$originalXMLFilePath" \
-			"$imageFilePath" --debug --verbose &>"${LOGFILE}"
-	fi
-fi
-
-# absolute or relative path?
-xmlfile=$1
-if ls "${xmlfile}" 2>/dev/null | grep '/' >/dev/null 2>&1; then
-	xmlpath=$(dirname "${xmlfile}")
-	xmlfile=$(basename "${xmlfile}")
-else
-	xmlpath=${vmchooser_xmlpath}
-fi
-# full path
-xmlfile="${xmlpath}/${xmlfile%.xml}.xml"
-
-DO_PROFILE="$(grep -c -E -i '<\s*profile\s*param="?(true|yes)"?' "$xmlfile")"
-
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/includes/get_xml_file_variables.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/get_xml_file_variables.inc
deleted file mode 100644
index b7ed648c..00000000
--- a/remote/modules/run-virt/data/opt/openslx/scripts/includes/get_xml_file_variables.inc
+++ /dev/null
@@ -1,103 +0,0 @@
-###########################################
-# Include: Set hardware related variables #
-###########################################
-
-writelog "Starting configuration..."
-writelog "\tLogfile:\t\t${LOGFILE}"
-writelog "\t/tmp info:\t\t$(df -h | grep " /tmp$" | awk '{print $2}') \c"
-writelog "$(grep "/tmp " /proc/mounts | awk '{print $1" "$2" "$3" "$4}')"
-writelog "\tVM XML dir:\t\t$(dirname "${xmlfile}")"
-writelog "\tXML file:\t\t${xmlfile}"
-writelog "Enable 3D:\t\t${enable3d}"
-writelog "VM config:"
-
-# # Name of the virt image
-imgname=$(grep -io '<image_path param=.*"' "${xmlfile}" | sed -e "s/&.*;/; /g" | awk -F '"' '{ print $2 }')
-imgrelpath=$(grep -io '<image_name param=.*"' "${xmlfile}" | sed -e "s/&.*;/; /g" | awk -F '"' '{ print $2 }')
-# [ -z "$imgname" ] && imgname="${imgrelpath}"
-imgrelpath=${imgrelpath#/mnt/vmstore/}
-
-writelog "Virtual image file name: $imgname"
-
-# Imagename w/ full path
-if echo "${imgname}" | grep -q '^/'; then
-	imgpath="$(dirname "${imgname}")"
-	imgname="$(basename "${imgname}")"
-	vmpath="${imgpath}/${imgname}"
-	# If old vmchooser binary stuff
-	# We do not need folder name as it is already included by vmchooser
-elif echo "${xmlfile}" | grep -q '^/tmp/'; then
-	vmpath="$imgname"
-	imgname="$(basename "${imgname}")"
-	## Added for persistent support.
-else
-	# Else use same path as xml
-	imgpath="${xmlpath}"
-	vmpath="${imgpath}/${imgname}"
-fi
-
-# If ${vm_name} not defined use ${xmlfile}
-vm_name="${vm_name:-${xmlfile%.xml}}"
-
-# Define vm_shortname since vm_name can be very long
-vm_shortname="$(basename "${xmlfile%.xml}" | sed -e "s, ,-,g")"
-
-# vm_name = displayname, define for old scripts
-displayname="${vm_name}"
-
-# image is for the following virtual machine
-xmlvirt=$(grep -o 'virtualmachine param=.*"' "${xmlfile}" \
-	| sed -e "s/&.*;/; /g" | awk -F '"' '{print $2}')
-
-# choose the proper virtualization/emulator plugin
-[ "x${xmlvirt}" != "x" -a "x${xmlvirt}" != "xqemukvm" -a "x${xmlvirt}" != "xvirtualbox" -a "x${xmlvirt}" != "xvmware" ] && xmlvirt="emufe"
-
-# Extracting OS type (vmostype) from xml file. We don't care here whether vmostype is empty, as then 
-# it will yield the default entries later on.
-vmostype=$(grep -io '<os param=.*"' "${xmlfile}" | sed -e "s/&.*;/; /g" | awk -F '"' '{ print $2 }')
-
-# make a guess from the filename extension if ${xmlvirt} is empty
-# (not set within the XML file)
-# TODO: implement possibility to submit own configuration files
-if [ -z "${xmlvirt}" ] && [ -n "${additional_config}" ]; then
-	writelog "No virtual machine parameter defined in ${xmlfile}"
-	writelog "Trying to guess VM...\c"
-	case "$(cat ${additional_config} | tr \"[A-Z]\" \"[a-z]\")" in
-		*config.version*|*virtualhw.version*|*independent-nonpersistent*|*vmdk*)
-			xmlvirt="vmware"
-		;;
-		*innotek*|*virtualbox*)
-			xmlvirt="virtualbox"
-		;;
-		*qemu*|*kvm*)
-			xmlvirt="qemukvm"
-		;;
-		*)
-			xmlvirt="none"
-		;;
-	esac
-	elif [ -z "${xmlvirt}" ]; then
-	case "$(echo ${imgname##*.} | tr \"[A-Z]\" \"[a-z]\")" in
-		vmdk)
-			xmlvirt="vmware"
-		;;
-		vbox|vdi)
-			xmlvirt="virtualbox"
-		;;
-		qcow*)
-			xmlvirt="qemukvm"
-		;;
-		*)
-			xmlvirt="emufe"
-		;;
-	esac
-	writelog "result:\t${xmlvirt}"
-fi
-
-# Set redirects to 0, see vmgrid if you want to define some
-redirects=0
-
-writelog "\tVirtualization:\t\t$xmlvirt"
-writelog "\tVM name:\t\t$vm_name"
-writelog "\tVM short name:\t\t$vm_shortname"
-writelog "\tVM OS:\t\t$vmostype" 
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/includes/get_xml_file_variables_legacy.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/get_xml_file_variables_legacy.inc
deleted file mode 100644
index 3fdc06d2..00000000
--- a/remote/modules/run-virt/data/opt/openslx/scripts/includes/get_xml_file_variables_legacy.inc
+++ /dev/null
@@ -1,120 +0,0 @@
-###########################################
-# Include: Set hardware related variables #
-###########################################
-
-writelog "Starting configuration..."
-writelog "\tLogfile:\t\t${LOGFILE}"
-writelog "\t/tmp info:\t\t$(df -h | grep " /tmp$" | awk '{print $2}') \c"
-writelog "$(grep "/tmp " /proc/mounts | awk '{print $1" "$2" "$3" "$4}')"
-writelog "\tVM XML dir:\t\t$(dirname "${xmlfile}")"
-writelog "\tXML file:\t\t${xmlfile}"
-writelog "Enable 3D:\t\t${enable3d}"
-writelog "VM config:"
-
-# Name of the virt image
-imgname=$(grep -io '<image_path param=.*"' "${xmlfile}" | sed -e "s/&.*;/; /g" | awk -F '"' '{ print $2 }')
-imgrelpath=$(grep -io '<image_name param=.*"' "${xmlfile}" | sed -e "s/&.*;/; /g" | awk -F '"' '{ print $2 }')
-[ -z "$imgname" ] && imgname="${imgrelpath}"
-imgrelpath=${imgrelpath#/mnt/vmstore/}
-
-## Added for persistent support.
-if [[ "$userBranchFilePath" ]]; then
-	imgname="$userBranchFilePath"
-fi
-
-# Imagename w/ full path
-if echo "${imgname}" | grep -q '^/'; then
-	imgpath="$(dirname "${imgname}")"
-	imgname="$(basename "${imgname}")"
-	vmpath="${imgpath}/${imgname}"
-	# If old vmchooser binary stuff
-	# We do not need folder name as it is already included by vmchooser
-elif echo "${xmlfile}" | grep -q '^/tmp/'; then
-	vmpath="$imgname"
-	imgname="$(basename "${imgname}")"
-	## Added for persistent support.
-elif [[ "$userBranchFilePath" ]]; then
-	vmpath="$userBranchFilePath"
-else
-	# Else use same path as xml
-	imgpath="${xmlpath}"
-	vmpath="${imgpath}/${imgname}"
-fi
-
-# Name of the virt machine, sed because of Windows formatting
-vm_name=$(grep -o 'short_description param=.*"' "${xmlfile}" \
-	| sed -e "s/&.*;/; /g" | awk -F '"' '{print $2}')
-
-# If ${vm_name} not defined use ${xmlfile}
-vm_name="${vm_name:-${xmlfile%.xml}}"
-
-# Define vm_shortname since vm_name can be very long
-vm_shortname="$(basename "${xmlfile%.xml}" | sed -e "s, ,-,g")"
-
-# vm_name = displayname, define for old scripts
-displayname="${vm_name}"
-
-# image is for the following virtual machine
-xmlvirt=$(grep -o 'virtualmachine param=.*"' "${xmlfile}" \
-	| sed -e "s/&.*;/; /g" | awk -F '"' '{print $2}')
-
-# choose the proper virtualization/emulator plugin
-[ "x${xmlvirt}" != "x" -a "x${xmlvirt}" != "xqemukvm" -a "x${xmlvirt}" != "xvirtualbox" -a "x${xmlvirt}" != "xvmware" ] && xmlvirt="emufe"
-
-# make a guess from the filename extension if ${xmlvirt} is empty
-# (not set within the XML file)
-# TODO: implement possibility to submit own configuration files
-if [ -z "${xmlvirt}" ] && [ -n "${additional_config}" ]; then
-	writelog "No virtual machine parameter defined in ${xmlfile}"
-	writelog "Trying to guess VM...\c"
-	case "$(cat ${additional_config} | tr \"[A-Z]\" \"[a-z]\")" in
-		*config.version*|*virtualhw.version*|*independent-nonpersistent*|*vmdk*)
-			xmlvirt="vmware"
-		;;
-		*innotek*|*virtualbox*)
-			xmlvirt="virtualbox"
-		;;
-		*qemu*|*kvm*)
-			xmlvirt="qemukvm"
-		;;
-		*)
-			xmlvirt="none"
-		;;
-	esac
-	elif [ -z "${xmlvirt}" ]; then
-	case "$(echo ${imgname##*.} | tr \"[A-Z]\" \"[a-z]\")" in
-		vmdk)
-			xmlvirt="vmware"
-		;;
-		vbox|vdi)
-			xmlvirt="virtualbox"
-		;;
-		qcow*)
-			xmlvirt="qemukvm"
-		;;
-		*)
-			xmlvirt="emufe"
-		;;
-	esac
-	writelog "result:\t${xmlvirt}"
-fi
-
-# Definition of the client system
-vmostype=$(grep -io '<os param=.*"' "${xmlfile}" | awk -F '"' '{ print $2 }' | tr "[A-Z]" "[a-z]")
-
-# Definition of the networking the client system is connected to
-network_kind=$(grep -io '<network param=.*"' "${xmlfile}" | awk -F '"' '{ print $2 }' | tr "[A-Z]" "[a-z]")
-network_card=$(grep -io '<netcard param=.*"' "${xmlfile}" | awk -F '"' '{ print $2 }'| tr "[A-Z]" "[a-z]")
-override_hddtype=$(grep -io '<hddtype param=.*"' "${xmlfile}" | awk -F '"' '{ print $2 }'| tr "[A-Z]" "[a-z]")
-
-# Set redirects to 0, see vmgrid if you want to define some
-redirects=0
-
-# Serial/parallel ports defined (e.g. "ttyS0" or "autodetect")
-serial=$(grep -io '<serialport param=.*"' "${xmlfile}" | awk -F '"' '{ print $2 }')
-parallel=$(grep -io '<parport param=.*"' "${xmlfile}" | awk -F '"' '{ print $2 }')
-
-writelog "\tVirtualization:\t\t$xmlvirt"
-writelog "\tVM name:\t\t$vm_name"
-writelog "\tVM short name:\t\t$vm_shortname"
-
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/includes/print_runvirt_console_logo.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/print_runvirt_console_logo.inc
deleted file mode 100644
index 649cf956..00000000
--- a/remote/modules/run-virt/data/opt/openslx/scripts/includes/print_runvirt_console_logo.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-#######################################
-# Include: Print Logo for console use #
-#######################################
-
-cat <<EOL
-                                             __        __   
-                .----.--.--.-----.___.--.--.|__|.----.|  |_ 
-                |   _|  |  |     |___|  |  ||  ||   _||   _|
-                |__| |_____|__|__|    \___/ |__||__|  |____|
-          OpenSLX virtual machine environment preparation script ...
-
-EOL
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/includes/set_runvirt_hardware_variables.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/set_runvirt_hardware_variables.inc
deleted file mode 100644
index 9a46bc88..00000000
--- a/remote/modules/run-virt/data/opt/openslx/scripts/includes/set_runvirt_hardware_variables.inc
+++ /dev/null
@@ -1,102 +0,0 @@
-###########################################
-# Include: Set hardware related variables #
-###########################################
-
-get_vm_id() {
-	local script=${BASH_SOURCE[-1]}
-	[ -z "$script" ] && script="$0"
-	if [ -n "$script" ]; then
-		script=$(readlink -f "$script")
-		if [ -n "$script" ] && [ -s "$script" ]; then
-			#bingo
-			VM_ID=$(ps ax | grep -F "$script" | grep -v 'grep' | grep -o -- "${script}.*\$" | sort -u | wc -l)
-			if [ "$VM_ID" -gt 0 ]; then
-				[ "${#VM_ID}" -eq 1 ] && VM_ID="0${VM_ID}"
-				[ "${#VM_ID}" -gt 2 ] && VM_ID="${VM_ID:0:2}"
-				[ "${#VM_ID}" -eq 2 ] && return
-			fi
-		fi
-	fi
-	# fallback: take last two digits of current pid...
-	VM_ID=$(expr substr $$ $(expr ${#$} - 1) 2)
-}
-
-get_vm_id
-
-# Make sure cpu_cores is not empty
-cpu_cores=${cpu_cores:-"1"}
-
-# Amount of memory for the VM. Be generous if diff is written to HDD
-if mount | grep -q '^/dev/sd.*on.*/tmp'; then
-	reserve=20
-	min=768
-	max=1800
-else
-	reserve=65
-	min=768
-	max=8192
-fi
-
-# Calculate absulute amount of RAM that should stay available to the host
-reserve="$[ ( $totalmem * $reserve ) / 100 ]"
-# Respect some upper and lower bounds for the host amount
-[ "$reserve" -lt "$min" ] && reserve="$min"
-[ "$reserve" -gt "$max" ] && reserve="$max"
-
-# Get a result which can be divided by 4
-mem="$[ ( ( $totalmem - $reserve ) / 4 ) * 4 ]"
-if [ -n "$mainvirtmem" ]; then
-	forcemem="$[ "$mainvirtmem" / 4 * 4 ]"
-	mem="$forcemem"
-fi
-hostmem="$[ $totalmem - $mem ]"
-
-# Fill in VMID
-macaddrsuffix=$(echo "$macaddrsuffix" | sed "s/%VMID%/${VM_ID}/")
-
-if ! echo "$macaddrprefix" | grep -q -E '^[0-9A-F]{2}:[0-9A-F]{2}:[0-9A-F]{2}$'; then
-	slxlog "virt-mac" "Could not properly generate mac address prefix (got $macaddrprefix)"
-fi
-if ! echo "$macaddrsuffix" | grep -q -E '^[0-9A-F]{2}:[0-9A-F]{2}:[0-9A-F]{2}$'; then
-	slxlog "virt-mac" "Could not properly generate mac address suffix (got $macaddrsuffix)"
-fi
-macaddr="$macaddrprefix:$macaddrsuffix"
-
-# Virtual fd/cd/dvd and drive devices, floppy b: for configuration
-# if $floppy_0 from virtualization.conf set then fdtest="TRUE"
-fdtest=${floppy_0:+"TRUE"}
-# if $fdtest not set floppy0="FALSE", else "TRUE"
-floppy0=${fdtest:-"FALSE"}
-# if $cdrom_0 from virtualization.conf set then cdtest="TRUE"
-cdtest=${cdrom_0:+"TRUE"}
-# if $cdtest not set cdrom0="FALSE", else "TRUE"
-cdrom0=${cdtest:-"FALSE"}
-# if $cdrom_1 from virtualization.conf set then cdtest="TRUE"
-cdtest=${cdrom_1:+"TRUE"}
-# if $cdtest not set cdrom1="FALSE", else "TRUE"
-cdrom1=${cdtest:-"FALSE"}
-# IDE is expected default, test for the virtual disk image type should
-# be done while creating the runscripts ...
-# TODO enable SCSI support instead of just disabling it.
-ide="TRUE"
-scsi="FALSE"
-hddrv="ide"
-audio="true"
-remotedesktopport="590${VM_ID}"
-
-# Enable 3D
-enable3d=$(grep -i -o "<enable3d param=.*" "${xmlfile}" | awk -F '"' '{print $2}' | rv_clean_string)
-
-# Add rw share for home dir
-homesharepath="${HOME}/PERSISTENT"
-homesharename="home"
-
-# Add common share
-commonsharepath="${HOME}/SHARE"
-commonsharename="share"
-
-# Set hostname: using original hostname and adding string
-hostname="virt-$(hostname)"
-
-writelog "\tVM Hostname:\t\t$hostname"
-
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/includes/set_runvirt_hardware_variables_legacy.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/set_runvirt_hardware_variables_legacy.inc
deleted file mode 100644
index 05d55f00..00000000
--- a/remote/modules/run-virt/data/opt/openslx/scripts/includes/set_runvirt_hardware_variables_legacy.inc
+++ /dev/null
@@ -1,87 +0,0 @@
-###########################################
-# Include: Set hardware related variables #
-###########################################
-
-# take last two digits of current pid...
-VM_ID=$(expr substr $$ $(expr ${#$} - 1) 2)
-
-# Make sure cpu_cores is not empty
-cpu_cores=${cpu_cores:-"1"}
-
-# Amount of memory for the VM. Be generous if diff is written to HDD
-if mount | grep -q '^/dev/sd.*on.*/tmp'; then
-	reserve=20
-	min=768
-	max=1536
-else
-	reserve=65
-	min=768
-	max=8192
-fi
-
-# Calculate absulute amount of RAM that should stay available to the host
-reserve="$[ ( $totalmem * $reserve ) / 100 ]"
-# Respect some upper and lower bounds for the host amount
-[ "$reserve" -lt "$min" ] && reserve="$min"
-[ "$reserve" -gt "$max" ] && reserve="$max"
-
-# Get a result which can be divided by 4
-mem="$[ ( ( $totalmem - $reserve ) / 4 ) * 4 ]"
-if [ -n "$mainvirtmem" ]; then
-	forcemem="$[ "$mainvirtmem" / 4 * 4 ]"
-	mem="$forcemem"
-fi
-hostmem="$[ $totalmem - $mem ]"
-
-# TODO: We should only generate the suffix here (last 3 octets) as the first 3 are
-# dependant on the virtualizer/emulator. Check if any run-virt.include still relies on
-# $macguestpart/$macaddr. If so, fix it to use its specific first 3 bytes
-# and append $macaddrssuffix
-macguestpart="00:50:56:${VM_ID}"
-machostpart=$(echo "${hostmacaddr}" | awk -F ":" '{print $(NF-1)":"$NF}')
-macaddr=$(echo "${macguestpart}:${machostpart}" | tr "[a-z]" "[A-Z]")
-macaddrsuffix=$(echo "${VM_ID}:${machostpart}" | tr "[a-z]" "[A-Z]")
-
-if ! echo "$macaddrsuffix" | grep -q -E '^[0-9A-F]{2}:[0-9A-F]{2}:[0-9A-F]{2}$'; then
-	slxlog "virt-mac" "Could not properly generate mac address suffix (got $macaddrsuffix)"
-fi
-
-# Virtual fd/cd/dvd and drive devices, floppy b: for configuration
-# if $floppy_0 from virtualization.conf set then fdtest="TRUE"
-fdtest=${floppy_0:+"TRUE"}
-# if $fdtest not set floppy0="FALSE", else "TRUE"
-floppy0=${fdtest:-"FALSE"}
-# if $cdrom_0 from virtualization.conf set then cdtest="TRUE"
-cdtest=${cdrom_0:+"TRUE"}
-# if $cdtest not set cdrom0="FALSE", else "TRUE"
-cdrom0=${cdtest:-"FALSE"}
-# if $cdrom_1 from virtualization.conf set then cdtest="TRUE"
-cdtest=${cdrom_1:+"TRUE"}
-# if $cdtest not set cdrom1="FALSE", else "TRUE"
-cdrom1=${cdtest:-"FALSE"}
-# IDE is expected default, test for the virtual disk image type should
-# be done while creating the runscripts ...
-# TODO enable SCSI support instead of just disabling it.
-ide="TRUE"
-scsi="FALSE"
-hddrv="ide"
-audio="true"
-remotedesktopport="590${VM_ID}"
-
-
-# Enable 3D
-enable3d=$(grep -i -o "<enable3d param=.*" "${xmlfile}" | awk -F '"' '{print $2}' | rv_clean_string)
-
-# Add rw share for home dir
-homesharepath="${HOME}/PERSISTENT"
-homesharename="home"
-
-# Add common share
-commonsharepath="${HOME}/SHARE"
-commonsharename="share"
-
-# Set hostname: using original hostname and adding string
-hostname="virt-$(hostname)"
-
-writelog "\tVM Hostname:\t\t$hostname"
-
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/includes/set_runvirt_variables.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/set_runvirt_variables.inc
deleted file mode 100644
index 4c4ccf1d..00000000
--- a/remote/modules/run-virt/data/opt/openslx/scripts/includes/set_runvirt_variables.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-######################################################
-# Include: Declaration of run-virt default variables #
-######################################################
-
-VMCHOOSER_DIR="/opt/openslx/vmchooser"
-VMCHOOSER_CONF_DIR="$VMCHOOSER_DIR/config"
-LOGFILE="/var/log/openslx/run-virt.${USER}.$$.log"
-USER="$(whoami)"
-TMPDIR="/tmp/virt/${USER}/$$"
-
-readonly VMCHOOSER_DIR VMCHOOSER_CONF_DIR LOGFILE TMPDIR USER
-
-# include general configuration from vmchooser
-[ -f "$VMCHOOSER_CONF_DIR/vmchooser.conf" ] && . "$VMCHOOSER_CONF_DIR/vmchooser.conf"
-# load general virtualization information
-[ -f "$VMCHOOSER_CONF_DIR/virtualization.conf" ] && . "$VMCHOOSER_CONF_DIR/virtualization.conf"
-# Load general openslx config
-[ -f "/opt/openslx/config" ] && . "/opt/openslx/config"
-# Create temp dir
-if ! mkdir -p "$TMPDIR"; then
-	slxlog "virt-tmpdir" "Could not create temporary directory '$TMPDIR' for session"
-	error_user "Konnte kein temporäres Arbeitsverzeichnis für die VM-Sitzung anlegen. Ein Computer-Neustart könnte das Problem lösen."
-	cleanexit 1
-	exit 1
-fi
-
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_firewall.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_firewall.inc
deleted file mode 100644
index f0820ed7..00000000
--- a/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_firewall.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-
-setup_firewall () {
-	local LOGF="${TMPDIR}/firewall.log"
-	local RET
-	[ "$DISPLAY" = ":0" ] || return 0 # For now, to avoid conflicts, we only do this on display :0
-	slxfwtool "$IMGUUID" > "$LOGF" 2>&1
-	RET=$?
-	if [ "$RET" != "0" ]; then
-		slxlog "runvirt-firewall" "Error setting up firewall rules for lecture $IMGUUID (Exit code $RET)" "$LOGF"
-	fi
-	return 0
-}
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_image_access.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_image_access.inc
deleted file mode 100644
index 3c4ed330..00000000
--- a/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_image_access.inc
+++ /dev/null
@@ -1,71 +0,0 @@
-###########################################################
-# Include: Setup dnbd for image access, nfs/cifs fallback #
-###########################################################
-
-writelog "Now in setup_image_access.inc ..."
-
-# Try to use dnbd3 to access the image
-unset vm_diskfile
-unset vm_revision
-unset dnbd3_fuse_mount_point
-unset dnbd3_tmplog
-if ! which dnbd3-fuse; then
-	writelog "Can't use dnbd3 as dnbd3-fuse binary is not in PATH"
-elif [ -z "$SLX_DNBD3_SERVERS" ] || [ "x$SLX_VM_DNBD3" != "xyes" ]; then
-	writelog "Can't use dnbd3 as no servers are given in config, or SLX_VM_DNBD3 is not set to yes"
-else
-	# Mount path for images mounted with dnbd3-fuse
-	dnbd3_fuse_mount_point="$TMPDIR/dnbd3fuse.mnt"
-	mkdir -p "${dnbd3_fuse_mount_point}"
-	# start dnbd3-fuse in subshell
-	dnbd3_tmplog="$TMPDIR/dnbd3fuse.log"
-	dnbd3_exitflag="$TMPDIR/dnbd3exit$RANDOM"
-	rm -f -- "$dnbd3_exitflag"
-	(
-		dnbd3-fuse -f -o allow_other,max_readahead=262144 -h "$SLX_DNBD3_SERVERS" -i "${imgrelpath}" "${dnbd3_fuse_mount_point}" > "$dnbd3_tmplog" 2>&1
-		RET=$?
-		touch "$dnbd3_exitflag"
-		if [ "$RET" != "0" ]; then
-			writelog "dnbd3-fuse stopped working (Exit code $RET)"
-			slxlog "virt-dnbd3-fuse" "dnbd3-fuse stopped/refused serving '${imgrelpath}' from '${SLX_DNBD3_SERVERS}' with error code: $RET" "${dnbd3_tmplog}"
-		fi
-	) &
-	# give it a bit of time
-	usleep 250000
-	# check if we have the image
-	for TIMEOUT in 0.5 1 1 OUT; do
-		if [ -r "${dnbd3_fuse_mount_point}/img" ]; then
-			vm_revision="$(grep -m 1 "^Revision:" "${dnbd3_fuse_mount_point}/status" | cut  -d" " -f2)"
-			vm_diskfile="${dnbd3_fuse_mount_point}/img"
-			writelog "DNBD3: $imgrelpath on $vm_diskfile with rid $vm_revision"
-			vmpath="$vm_diskfile"
-			break
-		fi
-		[ "$TIMEOUT" = "OUT" -o -e "$dnbd3_exitflag" ] && break
-		sleep "$TIMEOUT"
-	done
-
-	if [ -z "$vm_diskfile" ]; then
-		slxlog "virt-dnbd3" "No dnbd3 server for ${imgrelpath} found, trying NFS/CIFS..." "$dnbd3_tmplog"
-		writelog "No working dnbd3 server found :-("
-	fi
-fi
-
-# $vm_diskfile will be empty if dnbd3 is not used or failed. Let's try to fall back to NFS/CIFS via file system
-if [ -z "$vm_diskfile" ]; then
-	new_vmpath=$(ls "${vmpath}.r"* | grep -E -o '\.r[0-9]+$' | grep -o -E '[0-9]+' | sort -n | tail -n 1)
-	[ -n "$new_vmpath" ] && vmpath="${vmpath}.r${new_vmpath}"
-	vm_diskfile="$vmpath"
-fi
-
-# Check if virtual machine container file exists
-if ! [ -e "${vmpath}" ]; then
-	slxlog "virt-image-missing" "VM image $vmpath not found!"
-	writelog "Virtual machine image ${vmpath} not found!"
-	error_user "Das Image für die gewählte Virtuelle Maschine konnte nicht gefunden werden.
-Versuchen Sie zunächst, den Computer komplett neu zu starten. Sollte das Problem bestehen bleiben, wenden Sie sich bitte an den Support."
-	cleanexit 1
-fi
-
-writelog "Virtual machine disk file: $vm_diskfile"
-
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_printer_lpd.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_printer_lpd.inc
deleted file mode 100644
index ee0b2c70..00000000
--- a/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_printer_lpd.inc
+++ /dev/null
@@ -1,33 +0,0 @@
-#####################################
-# Include: Setup printer daemon LPD #
-#####################################
-
-QUEUE="STANDARD" # This has to match the queue you configured in your VM
-SPOOLDIR=
-
-### Disabled: 100megs is not enough, some jobs are HUGE, try to use temp which should be on disk
-## Try using user's tmpfs home first, as it gets wiped on logout
-#if [ -n "${HOME}" ] && [ -w "${HOME}" ]; then
-#       SPOOLDIR="${HOME}/.spool"
-#       mkdir -p "${SPOOLDIR}/${QUEUE}"
-#fi
-# If failed, try to fall back to /tmp
-
-if [ -z "${SPOOLDIR}" ] || [ ! -w "${SPOOLDIR}/${QUEUE}" ]; then
-	SPOOLDIR="${TMPDIR}/printergui-${RANDOM}"
-	rm -rf -- "${SPOOLDIR}"
-	if ! mkdir -p "${SPOOLDIR}/${QUEUE}"; then
-		slxlog "virt-spooldir" "Could not create spool directory ($SPOOLDIR) for $USER - printing will not work!"
-		# TODO: Warn user
-	fi
-	chmod 0700 "${SPOOLDIR}/${QUEUE}"
-fi
-
-# Start the lpdaemon listening on the given port
-# TODO: externalize with something like runvirt.d (other parts might benefit from that too)
-tcpsvd -E 192.168.101.1 5515 \
-	lpd "$SPOOLDIR" \
-	ash -c "/opt/openslx/scripts/run-virt_print '${USER}' \"${SPOOLDIR}/${QUEUE}/\$DATAFILE\"" &
-
-# PID to kill the process
-PID_LPD="$!"
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_sound.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_sound.inc
deleted file mode 100644
index 201c0ff5..00000000
--- a/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_sound.inc
+++ /dev/null
@@ -1,64 +0,0 @@
-########################
-# Include: Setup sound #
-########################
-# 8086:1e20: Sound card in bwPX4
-
-writelog "Starting sound setup ..."
-
-if lspci -n | grep -E -i '8086:1e20( |$)'; then
-	VOL="100%" # bwPC 4: Speaker too quiet :-(
-else
-	VOL="85%"
-fi
-
-if true; then
-	# detecting which card is to be used
-	writelog "Detecting which sound card to use ..."
-	PROC="/proc/asound/cards"
-	if [ ! -r "$PROC" ]; then
-		writelog "'${PROC}' not found or not readable."
-		SOUND_CARD_INDEX=0
-		SOUND_CARD_COUNT=1
-	else
-		# Try to filter HDMI cards first
-		SOUND_CARD_INDEX=$(grep -v -i 'HDMI' "${PROC}" | grep -E -o '^[[:space:]]{0,2}[0-9]+[[:space:]]+' | head -n 1)
-		# If empty, try again with all
-		[ -z "${SOUND_CARD_INDEX}" ] && SOUND_CARD_INDEX=$(cat "${PROC}" | grep -E -o '^[[:space:]]{0,2}[0-9]+[[:space:]]+' | head -n 1)
-		if [ -z "${SOUND_CARD_INDEX}" ]; then
-			writelog "No sound card found."
-			SOUND_CARD_INDEX=0
-		fi
-		SOUND_CARD_COUNT=$(grep -E '^[[:space:]]{0,2}[0-9]+[[:space:]]+' "${PROC}" | wc -l)
-	fi
-	
-	SOUND_CARD_INDEX="$(grep -E -o '[0-9]+' <<<$SOUND_CARD_INDEX)"
-	writelog "Detected sound card index is: $SOUND_CARD_INDEX"
-	writelog "Sound card count: $SOUND_CARD_COUNT"
-	
-	# Adjust sound volume (playback)... Random mixer names we have encountered during testing
-	writelog "Setting up volume..."
-	amixer -q -c "$SOUND_CARD_INDEX" sset 'Master' "$VOL" unmute
-	amixer -q -c "$SOUND_CARD_INDEX" sset 'PCM' "$VOL" unmute
-	amixer -q -c "$SOUND_CARD_INDEX" sset 'CD' "$VOL" unmute
-	amixer -q -c "$SOUND_CARD_INDEX" sset 'Headphone' "$VOL" unmute
-	amixer -q -c "$SOUND_CARD_INDEX" sset 'Front' "$VOL" unmute
-	amixer -q -c "$SOUND_CARD_INDEX" sset 'Speaker' "$VOL" unmute
-	# Recording. It seems that (most) devices need the volume set to 0, so you
-	# don't hear your own mic input, but should be unmuted. Also on some cards,
-	# you need to set the cap option on the mic you want to use, while other cards
-	# will just ignore that option.
-	# Plus, most cards have a Capture mixer, which needs to be set to cap too, and
-	# have its volume turned up. (There'll probably be some cards that need yet
-	# another setup, but this works for now on 4 tested cards)
-	amixer -q -c "$SOUND_CARD_INDEX" sset 'Rear Mic Boost' "50%" cap unmute
-	amixer -q -c "$SOUND_CARD_INDEX" sset 'Rear Mic' "0%" cap unmute
-	amixer -q -c "$SOUND_CARD_INDEX" sset 'Front Mic Boost' "50%" cap unmute
-	amixer -q -c "$SOUND_CARD_INDEX" sset 'Front Mic' "0%" cap unmute
-	amixer -q -c "$SOUND_CARD_INDEX" sset 'Mic Boost' "50%" cap unmute
-	amixer -q -c "$SOUND_CARD_INDEX" sset 'Mic' "0%" cap unmute
-	amixer -q -c "$SOUND_CARD_INDEX" sset 'Capture' "100%" cap unmute
-	amixer -q -c "$SOUND_CARD_INDEX" sset 'Input Source' 'Front Mic' # Let's hope nobody uses rear mic...
-	# fix random static noise when starting vmplayer when module snd_pcsp (not pcspkr) is loaded
-	amixer -q -c pcsp sset Master "0%" mute
-	writelog "Done setting up volume."
-fi >> "${LOGFILE}" 2>&1
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_virtual_floppy.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_virtual_floppy.inc
deleted file mode 100644
index d9ae052c..00000000
--- a/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_virtual_floppy.inc
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/bash
-##############################################
-# Include: Setup virtual floppy for drive b: #
-##############################################
-
-declare -rg FLOPPYIMG="${TMPDIR}/floppy.img"
-declare -rg TMPHOME="${HOME}"
-declare -rg RUNSCRIPT="${TMPDIR}/runscript.tmp"
-
-wget -T 6 -O "${RUNSCRIPT}" "${SLX_VMCHOOSER_BASE_URL}/lecture/${IMGUUID}/runscript" > /dev/null &
-WGET=$!
-
-dd "if=/dev/zero" "of=${FLOPPYIMG}" count=1440 bs=1024
-chmod 0600 "${FLOPPYIMG}"
-mkfs.fat "${FLOPPYIMG}" || mkfs.vfat "${FLOPPYIMG}" || mkdosfs "${FLOPPYIMG}"
-
-# Create file with resolution information etc.
-. "/opt/openslx/inc/shares"
-if [ -z "$SHARE_REMAP_MODE" ]; then
-	SHARE_REMAP_MODE_INI="0"
-	SHARE_REMAP_MODE="3"
-else
-	SHARE_REMAP_MODE_INI="$SHARE_REMAP_MODE"
-fi
-[ -z "$SHARE_CREATE_MISSING_REMAP" ] && SHARE_CREATE_MISSING_REMAP="1"
-declare -rg RESOLUTION=$(xrandr | grep -o -E 'connected\s*(primary)?\s*[0-9]+x[0-9]+\+0\+0' \
-	| grep -o -E -m1 '[0-9]+x[0-9]+')
-
-# Legacy: HOSTRES.TXT
-cat > "${TMPDIR}/HOSTRES.TXT" <<-HIER
-${RESOLUTION}
-HIER
-
-# Create file for network shares to mount
-declare -rg SHARES="${TMPDIR}/shares.dat"
-touch "${SHARES}"
-chmod 0600 "${SHARES}"
-if ! pwdaemon --query "${TMPHOME}/.pwsocket" > "${SHARES}"; then
-	slxlog "virt-pwdaemon" "Could not start pwdaemon"
-else
-	sed -i 's/^/192.168.101.1\t/' "${SHARES}" # TODO: Depending on nettype (in case we have != nat some day)
-	if [ "${SHARE_REMAP_MODE}" = 1 -o "${SHARE_REMAP_MODE}" = 2 ] && [ -e "${TMPHOME}/.home" ]; then
-		NETHOME=$(cat "${TMPHOME}/.home")
-		[ -z "$SHARE_HOME_DRIVE" ] && SHARE_HOME_DRIVE="H:"
-		# Tab between items, so spaces can be used!
-		echo "${NETHOME}	${SHARE_HOME_DRIVE}	Home-Verzeichnis" >> "${SHARES}"
-	fi
-	for VAR in ${!SHARE_LINE_*}; do
-		echo "${!VAR}" >> "${SHARES}"
-	done
-fi
-
-wait "$WGET"
-
-# Check downloaded runscript, handle extension marker
-EXT=
-if [ -s "$RUNSCRIPT" ]; then
-	EXT=$(head -n 1 "$RUNSCRIPT" | grep -o -i '^EXT=.*$' | cut -d '=' -f 2-)
-	[ -n "$EXT" ] && [ "x${EXT:0:1}" != "x." ] && EXT=".$EXT"
-fi
-
-# Write info file
-UNAME=
-[ -s "${HOME}/.account" ] && UNAME=$(cat "${HOME}/.account")
-[ -z "${UNAME}" ] && UNAME=$(whoami)
-cat > "${TMPDIR}/openslx.ini" <<-HIER
-[openslx]
-username=${UNAME}
-resolution=${RESOLUTION}
-createMissingRemap=${SHARE_CREATE_MISSING_REMAP}
-remapMode=${SHARE_REMAP_MODE_INI}
-homeDrive=${SHARE_HOME_DRIVE}
-scriptExt=${EXT}
-
-[remap]
-documents=${SHARE_DOCUMENTS}
-downloads=${SHARE_DOWNLOADS}
-desktop=${SHARE_DESKTOP}
-media=${SHARE_MEDIA}
-other=${SHARE_OTHER}
-HIER
-
-# Copy all them there filez into floppy image
-mcopy -i "${FLOPPYIMG}" "${TMPDIR}/openslx.ini" "${TMPDIR}/HOSTRES.TXT" "${SHARES}" "::/"
-mcopy -i "${FLOPPYIMG}" "$VMCHOOSER_DIR/data/openslx.exe" "::/"
-# Copy guest configuration (with added information) config.xml to be accessed
-# via virtual floppy
-mcopy -i "${FLOPPYIMG}" "$xmlfile" "::/config.xml"
-
-# Copying linux directory:
-mcopy -s -i "${FLOPPYIMG}" "$VMCHOOSER_DIR/data/linux" "::/"
-
-# User supplied runscript
-if [ -n "$EXT" ]; then
-	sed -i '1d' "${RUNSCRIPT}"
-	mcopy -i "${FLOPPYIMG}" "${RUNSCRIPT}" "::/runscript${EXT}"
-fi
-
-rm -f -- "${SHARES}" "${TMPDIR}/openslx.ini" "${TMPDIR}/HOSTRES.TXT"
-unset SHARES VAR NETHOME UNAME
-
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_vm_hypervisor.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_vm_hypervisor.inc
deleted file mode 100644
index 33fd363b..00000000
--- a/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_vm_hypervisor.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-##########################################################################
-# Include: Setup virtual machine hypervisor via vm-specific include file #
-##########################################################################
-
-# Get all virtual machine specific stuff from the respective include file
-if [ ! -e "$VMCHOOSER_DIR/$xmlvirt/run-virt.include" ] ; then
-	slxlog "virt-plugin-missing" "Could not find run-virt.include for $xmlvirt ($VMCHOOSER_DIR/$xmlvirt/run-virt.include)"
-	writelog "Failed because of missing ${xmlvirt} plugin."
-	error_user "Konnte den Virtualisierer '$xmlvirt' nicht finden. Starten der Virtuellen Maschine fehlgeschlagen.
-	Starten Sie den Computer neu und wenden Sie sich an den Support, wenn das Problem weiterhin besteht."
-	cleanexit 1
-fi
-
-	self="${xmlvirt}"
-
-# Now including the hypervisor specific include file:
-if ! source "$VMCHOOSER_DIR/$xmlvirt/run-virt.include"; then
-	slxlog "virt-plugin-error" "run-virt.include for $xmlvirt could not be sourced (contains syntax errors?)" "$xmlvirt"
-	writelog "Erroneous run-virt.include for $xmlvirt"
-	error_user "Das Start-Script für den Virtualisierer '$xmlvirt' ist fehlerhaft.
-	Starten Sie den Computer neu und wenden Sie sich an den Support, wenn das Problem weiterhin besteht."
-fi
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/includes/start_windowmanager.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/start_windowmanager.inc
deleted file mode 100644
index da43f341..00000000
--- a/remote/modules/run-virt/data/opt/openslx/scripts/includes/start_windowmanager.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-####################################################
-# Include: Start windowmanager for easier handling #
-####################################################
-
-# Some problems may arise with windows opening in background when
-# using eg. vmware without a window manager.
-
-FOUND_WM=
-for dm in openbox kwin xfwm4 metacity blackbox twm fvwm2 ; do
-	if which $dm >/dev/null 2>&1 ; then
-		if [ "$dm" = "fvwm2" ] ; then
-			echo "EdgeScroll 0 0" > ${redodir}/fvwm
-			writelog "Starting fvwm2."
-			fvwm2 -f ${redodir}/fvwm >/dev/null 2>&1 &
-		else
-			writelog "Starting ${dm}."
-			$dm >/dev/null 2>&1 &
-		fi
-		FOUND_WM=1
-		break
-	fi
-done
-
-if [ -z "$FOUND_WM" ]; then
-	slxlog "virt-windowmanager" "Could not find any window manager to use!"
-	notify_user "Konnte keinen Window Manager finden. (Das ist schlecht!)"
-fi
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/includes/usb_detector.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/usb_detector.inc
deleted file mode 100644
index a2d442e4..00000000
--- a/remote/modules/run-virt/data/opt/openslx/scripts/includes/usb_detector.inc
+++ /dev/null
@@ -1,77 +0,0 @@
-# Helper function that will scan /dev/bus/usb for devices matching specific classes
-# and then output the corresponding device ids. This can be used for selective
-# handover of devices to a virtual machine
-
-declare -rg PASSTHROUGH_USB_DEVICES="2 0:5 0:6 0:7 0:14 0:16 0:17 239"
-
-# $1: expression to fill with device information.
-#     valid placeholders are:
-#     %VENDOR%  - device vendor id
-#     %PRODUCT% - device product id
-# $2-n: device classes to include in output
-get_usb_devices_int() {
-	[ -z "$TMPDIR" ] && TMPDIR="/tmp"
-	local EXP=$1
-	shift
-	if [ -z "$EXP" ]; then
-		writelog --quiet "No ouput expression template passed to get_usb_devices"
-		cleanexit 1
-	fi
-	if [ $# -eq 0 ]; then
-		writelog --quiet "No device classes given to get_usb_devices"
-		cleanexit 1
-	fi
-	local MATCH=';'
-	while [ $# -gt 0 ]; do
-		MATCH+="$1;"
-		[[ "$1" != *:* ]] && MATCH+="0:$1;"
-		shift
-	done
-	local dev=
-	local key value trailing
-	trailing=
-	local tmp="${TMPDIR}/lsusb.$$.$RANDOM"
-	for dev in /dev/bus/usb/*/*; do
-		if ! lsusb -D "$dev" > "$tmp" 2>/dev/null; then
-			writelog --quiet "Cannot lsusb $dev"
-			continue
-		fi
-		local DC=
-		local OK=
-		local VENDOR=
-		local PRODUCT=
-		while read -r key value trailing || [ -n "$key" ]; do
-			if [[ "$key" == "idVendor" ]]; then
-				[[ "$value" == 0x* ]] && VENDOR="${value:2}"
-			elif [[ "$key" == "idProduct" ]]; then
-				[[ "$value" == 0x* ]] && PRODUCT="${value:2}"
-			elif [ -z "$DC" ]; then
-				# No bDeviceClass seen yet
-				if [[ "$key" == "bDeviceClass" ]]; then
-					DC="$value"
-					[[ "$MATCH" == *";${DC};"* ]] && OK=yo
-				fi
-			else
-				# #DeviceClass is generic, look at sub class
-				if [[ "$key" == "bInterfaceClass" ]]; then
-					[[ "$MATCH" == *";${DC}:${value};"* ]] && OK=yo
-				fi
-			fi
-			if [ -n "$OK" -a -n "$VENDOR" -a -n "$PRODUCT" ]; then
-				echo "$EXP" | sed "s/%VENDOR%/${VENDOR}/g;s/%PRODUCT%/${PRODUCT}/g"
-				break
-			fi
-		done < "$tmp"
-	done
-	rm -f -- "$tmp"
-}
-
-get_usb_devices() {
-	if which lsusb 2>/dev/null >&2 && lsusb --help 2>&1 | grep -q -- '-D' 2>/dev/null; then
-		[ $# -eq 1 ] && set -- "$1" $PASSTHROUGH_USB_DEVICES # no quotes here!
-		get_usb_devices_int "$@" | sort -u
-	else
-		writelog --quiet "Cannot scan usb bus: lsusb not found or doesn't support -D"
-	fi
-}
-
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/includes/vmchooser_runvirt_functions.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/vmchooser_runvirt_functions.inc
deleted file mode 100644
index af9758e2..00000000
--- a/remote/modules/run-virt/data/opt/openslx/scripts/includes/vmchooser_runvirt_functions.inc
+++ /dev/null
@@ -1,76 +0,0 @@
-#######################################################
-# Include: Set functions needed by vmchooser-run_virt #
-#######################################################
-
-# function to write to stdout and logfile
-writelog() {
-	local DATE=$(date +%Y-%m-%d-%H-%M-%S)
-	# write to stdout?
-	if [ "x$1" = "x--quiet" ]; then
-		shift
-	else
-		echo -e "$DATE: $@"
-	fi
-	# log into file
-	echo -e "$DATE: $@" >> "${LOGFILE}"
-}
-
-notify_user() {
-	local TOPIC="$1"
-	shift
-	notify-send -u normal "$TOPIC" "$@"
-	writelog "Notify: **${TOPIC}**: $*"
-}
-
-error_user() {
-	local TOPIC="$1"
-	shift
-	local MSG TITLE BODY
-	if [ $# -gt 0 ]; then
-		MSG="   $TOPIC
-$*"
-		TITLE="$TOPIC"
-		BODY="$*"
-	else
-		MSG="$TOPIC"
-		TITLE="ERROR"
-		BODY="$TOPIC"
-	fi
-	/opt/openslx/cups/printergui --error "$MSG" && return
-	# printergui might not exist, try fallback here
-	# unfortunately, i can only think of notify+sleep right now
-	notify-send -u critical "$TITLE" "$BODY"
-	sleep 10
-}
-
-# Clean exit will be called at the end of vmchooser-run_virt
-cleanexit() {
-	sleep 1
-	# Ummount dnbd3-fuse
-	if [ -n "$dnbd3_fuse_mount_point" ] && [ -e "$dnbd3_fuse_mount_point/img" ]; then
-		for timeout in 1 1 1 FAIL; do
-			fusermount -u "$dnbd3_fuse_mount_point" && break
-			writelog "dnbd3 still busy...."
-			[ "$timeout" = "FAIL" ] && break
-			sleep "$timeout"
-		done
-	fi
-	# Kill LPD
-	[ -n "${PID_LPD}" ] && kill "${PID_LPD}"
-
-	# If we're not in debug mode, remove all temporary files
-	if [ -n "${TMPDIR}" -a -z "$SLX_DEBUG" ]; then
-		rm -rf -- "${TMPDIR}"
-	fi
-
-	[ $# -gt 0 ] && exit "$1"
-	exit 129 # No exit code was given :/
-}
-
-rv_clean_string() {
-	if [ "$#" -ge 1 ]; then
-		echo "$@" | tr '[A-Z]' '[a-z]' | tr -d -c '[a-z0-9\-]'
-	else
-		tr '[A-Z]' '[a-z]' | tr -d -c '[a-z0-9\-]'
-	fi
-}
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/vmchooser-run_virt b/remote/modules/run-virt/data/opt/openslx/scripts/vmchooser-run_virt
deleted file mode 100755
index ea3cfe8e..00000000
--- a/remote/modules/run-virt/data/opt/openslx/scripts/vmchooser-run_virt
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/bin/bash
-# Full bash required
-# -----------------------------------------------------------------------------
-# Copyright (c) 2007..2010 - RZ Uni FR
-# Copyright (c) 2007..2013 - OpenSLX GmbH
-#
-# This program is free software distributed under the GPL version 2.
-# See http://openslx.org/COPYING
-#
-# If you have any feedback please consult http://openslx.org/feedback and
-# send your suggestions, praise, or complaints to feedback@openslx.org
-#
-# General information about OpenSLX can be found at http://openslx.org/
-# -----------------------------------------------------------------------------
-# run-virt.sh
-#    - This is the generic wrapper for the several virtualization solutions.
-#      The idea is to setup a set of variables used by at least two different
-#      tools and then include the specific plugin which configures the speci-
-#      fied virtualization tool.
-################################################################################
-
-RUNVIRTINCLUDEDIR=/opt/openslx/scripts/includes
-xmlfile="$1"
-
-# Functions needed by vmchooser-run_virt (writelog(), cleanexit(), rv_clean_string())
-source ${RUNVIRTINCLUDEDIR}/vmchooser_runvirt_functions.inc && trap 'trap "" SIGINT SIGTERM; cleanexit' SIGINT SIGTERM
-# Define default dirs / get configs
-source ${RUNVIRTINCLUDEDIR}/set_runvirt_variables.inc
-# Function to detect whether we can use the new way (vmx via http) or the old way (legacy):
-source ${RUNVIRTINCLUDEDIR}/detect_legacy.inc # This yields LEGACY, IMGUUID, IMGVMX
-# For scanning for certain usb classes
-source "${RUNVIRTINCLUDEDIR}/usb_detector.inc"
-
-if [ "$LEGACY" ]; then
-	# check for important files used (filecheck()) - vestigial?
-	source ${RUNVIRTINCLUDEDIR}/check_runvirt_needed_files.inc
-	# Get XML file and dir, legacy (old way)
-	source ${RUNVIRTINCLUDEDIR}/get_xml_file_dir_legacy.inc		# xmlfile=$1
-	# xml file sanity checks, legacy
-	source ${RUNVIRTINCLUDEDIR}/check_runvirt_xml_sanity_legacy.inc
-	# print console logo
-	source ${RUNVIRTINCLUDEDIR}/print_runvirt_console_logo.inc
-	# Read needed variables from XML file
-	source ${RUNVIRTINCLUDEDIR}/get_xml_file_variables_legacy.inc
-	# Declaration of hardware relatedt variables
-	source ${RUNVIRTINCLUDEDIR}/set_runvirt_hardware_variables_legacy.inc
-	# Sound setup the rest of the environment and run the configured vm
-	source ${RUNVIRTINCLUDEDIR}/setup_sound.inc
-	# Start printer daemon
-	source ${RUNVIRTINCLUDEDIR}/setup_printer_lpd.inc
-	# Setup virtual floppy b: for windows guests with config.xml, openslx.exe etc.
-	source ${RUNVIRTINCLUDEDIR}/setup_virtual_floppy.inc
-	# Try to use dnbd3 to access the image, nfs/cifs fallback
-	source ${RUNVIRTINCLUDEDIR}/setup_image_access.inc
-	# Get all virtual machine specific stuff from the respective include file
-	source ${RUNVIRTINCLUDEDIR}/setup_vm_hypervisor.inc
-	# start a windowmanager for easier handling
-	source ${RUNVIRTINCLUDEDIR}/start_windowmanager.inc
-	# Check if tcpsvd is running. Do not check immediately after spawning,
-	# as this could result in success even if it's not really working.
-	source ${RUNVIRTINCLUDEDIR}/check_lpd.inc
-else
-	# check for important files used (filecheck()) - vestigial?
-	# This include does not currently work. TODO.
-	# source ${RUNVIRTINCLUDEDIR}/check_runvirt_needed_files.inc && filecheck
-
-	# Firewall
-	source "${RUNVIRTINCLUDEDIR}/setup_firewall.inc" || writelog "Could not source setup_firewall"
-	setup_firewall || writelog "Could not run setup_firewall"
-
-	# Read needed variables from XML file
-	source ${RUNVIRTINCLUDEDIR}/get_xml_file_variables.inc
-
-	# Sound setup the rest of the environment and run the configured vm
-	source ${RUNVIRTINCLUDEDIR}/setup_sound.inc
-
-	# Declaration of hardware relatedt variables
-	source ${RUNVIRTINCLUDEDIR}/set_runvirt_hardware_variables.inc
-
-	# Start printer daemon
-	source ${RUNVIRTINCLUDEDIR}/setup_printer_lpd.inc
-
-	# Setup virtual floppy b: for windows guests with config.xml, openslx.exe etc.
-	source ${RUNVIRTINCLUDEDIR}/setup_virtual_floppy.inc
-
-	# Get all virtual machine specific stuff from the respective include file
-	source ${RUNVIRTINCLUDEDIR}/setup_image_access.inc
-
-	# start a windowmanager for easier handling	
-	source ${RUNVIRTINCLUDEDIR}/setup_vm_hypervisor.inc
-
-	# Try to use dnbd3 to access the image, nfs/cifs fallback
-	source ${RUNVIRTINCLUDEDIR}/start_windowmanager.inc
-
-	# Check if tcpsvd is running. Do not check immediately after spawning,
-	# as this could result in success even if it's not really working.
-	source ${RUNVIRTINCLUDEDIR}/check_lpd.inc
-
-fi
-
-# This will start the VM
-writelog "VM command: eval ${VIRTCMD} ${VIRTCMDOPTS}"
-
-# Transported from vmware-runvirt include
-sync
-
-eval ${VIRTCMD} ${VIRTCMDOPTS}
-writelog "Bye."
-
-# Postrun for commands after virtualization finishes
-if [ -n "${POSTRUN}" ]; then
-	eval ${POSTRUN}  >/dev/null 2>&1
-fi
-
-cleanexit 0
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/vmchooser-run_virt b/remote/modules/run-virt/data/opt/openslx/scripts/vmchooser-run_virt
new file mode 120000
index 00000000..447f98bc
--- /dev/null
+++ b/remote/modules/run-virt/data/opt/openslx/scripts/vmchooser-run_virt
@@ -0,0 +1 @@
+/opt/openslx/vmchooser/vmchooser-run_virt
\ No newline at end of file
diff --git a/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/check_runvirt_needed_files.inc b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/check_runvirt_needed_files.inc
new file mode 100644
index 00000000..fbb0bc70
--- /dev/null
+++ b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/check_runvirt_needed_files.inc
@@ -0,0 +1,53 @@
+#################################################################
+# Include: Check for important files used by vmchooser_run-virt #
+#################################################################
+
+# WARNING: This is perhaps vestigial!
+
+filecheck() {
+        filecheck=$(LANG=us ls -lh ${diskfile} 2>&1)
+        writelog "Filecheck:\n${filecheck}\n"
+        noimage=$(echo ${filecheck} | grep -i "no such file or directory" | wc -l)
+        rightsfile=${diskfile}
+
+        # check if link
+        if [ -L "${diskfile}" ]; then
+                # take link target
+                rightsfile=$(ls -lh ${diskfile} 2>&1 | awk -F '-> *' '{print $2}')
+                rightsfile=${vmdir}/${rightsfile}
+                filecheck=$(LANG=us ls -lh ${rightsfile} 2>&1)
+        fi
+
+        # does file exist
+        if [ "${noimage}" -ge "1" ]; then
+                writelog "Virtual Machine Image Problem:\c "
+                writelog "\tThe image you've specified doesn't exist."
+                writelog "Filecheck says:\c "
+                writelog "\t\t${diskfile}:\n\t\t\tNo such file or directory"
+                writelog "Hint:\c "
+                writelog "\t\t\tCompare spelling of the image with your options.\n"
+                exit 1
+        fi
+        # readable by calling user
+        if ! [ -r "${diskfile}" >/dev/null 2>&1 \
+                -o -r "${diskfile}" >/dev/null 2>&1 ]; then
+                writelog "Vmware Image Problem:\c "
+                writelog "\tThe image you've specified has wrong rights."
+                writelog "Filecheck says:\t\t$(echo ${filecheck} \
+                | awk '{print $1" "$3" "$4}') ${rightsfile}"
+                writelog "Hint:\t\t\tChange rights with: chmod a+r ${rightsfile}\n"
+                exit 1
+        fi
+
+        # writable (for persistent-mode)?
+        if ! [ -w "${diskfile}" >/dev/null 2>&1 \
+        -o -w "${diskfile}" >/dev/null 2>&1 ] \
+        && [ "${np}" = "independent-persistent" ]; then
+                writelog "Vmware Image Problem:\c "
+                writelog "\tThe image you have specified has wrong rights."
+                writelog "Filecheck says:\t\t$(echo ${filecheck} \
+                | awk '{print $1" "$3" "$4}') ${rightsfile}"
+                writelog "Hint:\t\t\tUse nonpersistent-mode or change rights to rw\n"
+                exit 1
+        fi
+}
diff --git a/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/detect_legacy.inc b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/detect_legacy.inc
new file mode 100644
index 00000000..8bdfd8b1
--- /dev/null
+++ b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/detect_legacy.inc
@@ -0,0 +1,34 @@
+########################################################
+# Include: Detect, whether runvirt runs in legacy mode #
+########################################################
+
+# Legacy mode: As runvirt has been before.
+# New mode: uuid in xml _and_ vmx given via http.
+
+writelog "Detecting current/legacy mode ..."
+
+# First, let's try to extract an imguuid from xmlfile:
+declare -rg IMGUUID=$(grep -i -o '<uuid param=.*"' "${xmlfile}" | sed -e "s/&.*;/; /g" | awk -F '"' '{ print $2 }')
+declare -rg TMPCONFIG="$TMPDIR/vmconfig.tmp"
+
+writelog "IMGUUID extracted: $IMGUUID"
+
+# Assume legacy mode by default, only trigger "current" mode if everything else below worked
+LEGACY=yes
+if [ -z "$IMGUUID" ]; then	# Keine uuid: Abbruch, Legacy
+	writelog "Could not extract a uuid param from ${xmlfile}. Triggering legacy mode."
+else
+	# Now getting template file:
+	if ! wget -T 6 -O "$TMPCONFIG" "${SLX_VMCHOOSER_BASE_URL}/lecture/${IMGUUID}" 2>/dev/null >&2; then
+		writelog "wget ${SLX_VMCHOOSER_BASE_URL}/lecture/${IMGUUID}. Triggering legacy mode."
+	else
+		writelog "wget ${SLX_VMCHOOSER_BASE_URL}/lecture/${IMGUUID} successful."
+		if [ ! -s "$TMPCONFIG" ]; then
+			writelog "Server sent zero byte virtual machine description file. Triggering legacy mode."
+		else
+			writelog "Triggering current (non-legacy) mode."
+			LEGACY=		# everything worked - clear legacy mode variable (so we use the "current" mode)
+		fi
+	fi
+fi
+
diff --git a/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/get_xml_file_variables.inc b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/get_xml_file_variables.inc
new file mode 100644
index 00000000..b7ed648c
--- /dev/null
+++ b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/get_xml_file_variables.inc
@@ -0,0 +1,103 @@
+###########################################
+# Include: Set hardware related variables #
+###########################################
+
+writelog "Starting configuration..."
+writelog "\tLogfile:\t\t${LOGFILE}"
+writelog "\t/tmp info:\t\t$(df -h | grep " /tmp$" | awk '{print $2}') \c"
+writelog "$(grep "/tmp " /proc/mounts | awk '{print $1" "$2" "$3" "$4}')"
+writelog "\tVM XML dir:\t\t$(dirname "${xmlfile}")"
+writelog "\tXML file:\t\t${xmlfile}"
+writelog "Enable 3D:\t\t${enable3d}"
+writelog "VM config:"
+
+# # Name of the virt image
+imgname=$(grep -io '<image_path param=.*"' "${xmlfile}" | sed -e "s/&.*;/; /g" | awk -F '"' '{ print $2 }')
+imgrelpath=$(grep -io '<image_name param=.*"' "${xmlfile}" | sed -e "s/&.*;/; /g" | awk -F '"' '{ print $2 }')
+# [ -z "$imgname" ] && imgname="${imgrelpath}"
+imgrelpath=${imgrelpath#/mnt/vmstore/}
+
+writelog "Virtual image file name: $imgname"
+
+# Imagename w/ full path
+if echo "${imgname}" | grep -q '^/'; then
+	imgpath="$(dirname "${imgname}")"
+	imgname="$(basename "${imgname}")"
+	vmpath="${imgpath}/${imgname}"
+	# If old vmchooser binary stuff
+	# We do not need folder name as it is already included by vmchooser
+elif echo "${xmlfile}" | grep -q '^/tmp/'; then
+	vmpath="$imgname"
+	imgname="$(basename "${imgname}")"
+	## Added for persistent support.
+else
+	# Else use same path as xml
+	imgpath="${xmlpath}"
+	vmpath="${imgpath}/${imgname}"
+fi
+
+# If ${vm_name} not defined use ${xmlfile}
+vm_name="${vm_name:-${xmlfile%.xml}}"
+
+# Define vm_shortname since vm_name can be very long
+vm_shortname="$(basename "${xmlfile%.xml}" | sed -e "s, ,-,g")"
+
+# vm_name = displayname, define for old scripts
+displayname="${vm_name}"
+
+# image is for the following virtual machine
+xmlvirt=$(grep -o 'virtualmachine param=.*"' "${xmlfile}" \
+	| sed -e "s/&.*;/; /g" | awk -F '"' '{print $2}')
+
+# choose the proper virtualization/emulator plugin
+[ "x${xmlvirt}" != "x" -a "x${xmlvirt}" != "xqemukvm" -a "x${xmlvirt}" != "xvirtualbox" -a "x${xmlvirt}" != "xvmware" ] && xmlvirt="emufe"
+
+# Extracting OS type (vmostype) from xml file. We don't care here whether vmostype is empty, as then 
+# it will yield the default entries later on.
+vmostype=$(grep -io '<os param=.*"' "${xmlfile}" | sed -e "s/&.*;/; /g" | awk -F '"' '{ print $2 }')
+
+# make a guess from the filename extension if ${xmlvirt} is empty
+# (not set within the XML file)
+# TODO: implement possibility to submit own configuration files
+if [ -z "${xmlvirt}" ] && [ -n "${additional_config}" ]; then
+	writelog "No virtual machine parameter defined in ${xmlfile}"
+	writelog "Trying to guess VM...\c"
+	case "$(cat ${additional_config} | tr \"[A-Z]\" \"[a-z]\")" in
+		*config.version*|*virtualhw.version*|*independent-nonpersistent*|*vmdk*)
+			xmlvirt="vmware"
+		;;
+		*innotek*|*virtualbox*)
+			xmlvirt="virtualbox"
+		;;
+		*qemu*|*kvm*)
+			xmlvirt="qemukvm"
+		;;
+		*)
+			xmlvirt="none"
+		;;
+	esac
+	elif [ -z "${xmlvirt}" ]; then
+	case "$(echo ${imgname##*.} | tr \"[A-Z]\" \"[a-z]\")" in
+		vmdk)
+			xmlvirt="vmware"
+		;;
+		vbox|vdi)
+			xmlvirt="virtualbox"
+		;;
+		qcow*)
+			xmlvirt="qemukvm"
+		;;
+		*)
+			xmlvirt="emufe"
+		;;
+	esac
+	writelog "result:\t${xmlvirt}"
+fi
+
+# Set redirects to 0, see vmgrid if you want to define some
+redirects=0
+
+writelog "\tVirtualization:\t\t$xmlvirt"
+writelog "\tVM name:\t\t$vm_name"
+writelog "\tVM short name:\t\t$vm_shortname"
+writelog "\tVM OS:\t\t$vmostype" 
diff --git a/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/set_runvirt_hardware_variables.inc b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/set_runvirt_hardware_variables.inc
new file mode 100644
index 00000000..9a46bc88
--- /dev/null
+++ b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/set_runvirt_hardware_variables.inc
@@ -0,0 +1,102 @@
+###########################################
+# Include: Set hardware related variables #
+###########################################
+
+get_vm_id() {
+	local script=${BASH_SOURCE[-1]}
+	[ -z "$script" ] && script="$0"
+	if [ -n "$script" ]; then
+		script=$(readlink -f "$script")
+		if [ -n "$script" ] && [ -s "$script" ]; then
+			#bingo
+			VM_ID=$(ps ax | grep -F "$script" | grep -v 'grep' | grep -o -- "${script}.*\$" | sort -u | wc -l)
+			if [ "$VM_ID" -gt 0 ]; then
+				[ "${#VM_ID}" -eq 1 ] && VM_ID="0${VM_ID}"
+				[ "${#VM_ID}" -gt 2 ] && VM_ID="${VM_ID:0:2}"
+				[ "${#VM_ID}" -eq 2 ] && return
+			fi
+		fi
+	fi
+	# fallback: take last two digits of current pid...
+	VM_ID=$(expr substr $$ $(expr ${#$} - 1) 2)
+}
+
+get_vm_id
+
+# Make sure cpu_cores is not empty
+cpu_cores=${cpu_cores:-"1"}
+
+# Amount of memory for the VM. Be generous if diff is written to HDD
+if mount | grep -q '^/dev/sd.*on.*/tmp'; then
+	reserve=20
+	min=768
+	max=1800
+else
+	reserve=65
+	min=768
+	max=8192
+fi
+
+# Calculate absulute amount of RAM that should stay available to the host
+reserve="$[ ( $totalmem * $reserve ) / 100 ]"
+# Respect some upper and lower bounds for the host amount
+[ "$reserve" -lt "$min" ] && reserve="$min"
+[ "$reserve" -gt "$max" ] && reserve="$max"
+
+# Get a result which can be divided by 4
+mem="$[ ( ( $totalmem - $reserve ) / 4 ) * 4 ]"
+if [ -n "$mainvirtmem" ]; then
+	forcemem="$[ "$mainvirtmem" / 4 * 4 ]"
+	mem="$forcemem"
+fi
+hostmem="$[ $totalmem - $mem ]"
+
+# Fill in VMID
+macaddrsuffix=$(echo "$macaddrsuffix" | sed "s/%VMID%/${VM_ID}/")
+
+if ! echo "$macaddrprefix" | grep -q -E '^[0-9A-F]{2}:[0-9A-F]{2}:[0-9A-F]{2}$'; then
+	slxlog "virt-mac" "Could not properly generate mac address prefix (got $macaddrprefix)"
+fi
+if ! echo "$macaddrsuffix" | grep -q -E '^[0-9A-F]{2}:[0-9A-F]{2}:[0-9A-F]{2}$'; then
+	slxlog "virt-mac" "Could not properly generate mac address suffix (got $macaddrsuffix)"
+fi
+macaddr="$macaddrprefix:$macaddrsuffix"
+
+# Virtual fd/cd/dvd and drive devices, floppy b: for configuration
+# if $floppy_0 from virtualization.conf set then fdtest="TRUE"
+fdtest=${floppy_0:+"TRUE"}
+# if $fdtest not set floppy0="FALSE", else "TRUE"
+floppy0=${fdtest:-"FALSE"}
+# if $cdrom_0 from virtualization.conf set then cdtest="TRUE"
+cdtest=${cdrom_0:+"TRUE"}
+# if $cdtest not set cdrom0="FALSE", else "TRUE"
+cdrom0=${cdtest:-"FALSE"}
+# if $cdrom_1 from virtualization.conf set then cdtest="TRUE"
+cdtest=${cdrom_1:+"TRUE"}
+# if $cdtest not set cdrom1="FALSE", else "TRUE"
+cdrom1=${cdtest:-"FALSE"}
+# IDE is expected default, test for the virtual disk image type should
+# be done while creating the runscripts ...
+# TODO enable SCSI support instead of just disabling it.
+ide="TRUE"
+scsi="FALSE"
+hddrv="ide"
+audio="true"
+remotedesktopport="590${VM_ID}"
+
+# Enable 3D
+enable3d=$(grep -i -o "<enable3d param=.*" "${xmlfile}" | awk -F '"' '{print $2}' | rv_clean_string)
+
+# Add rw share for home dir
+homesharepath="${HOME}/PERSISTENT"
+homesharename="home"
+
+# Add common share
+commonsharepath="${HOME}/SHARE"
+commonsharename="share"
+
+# Set hostname: using original hostname and adding string
+hostname="virt-$(hostname)"
+
+writelog "\tVM Hostname:\t\t$hostname"
+
diff --git a/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/set_runvirt_variables.inc b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/set_runvirt_variables.inc
new file mode 100644
index 00000000..4c4ccf1d
--- /dev/null
+++ b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/set_runvirt_variables.inc
@@ -0,0 +1,26 @@
+######################################################
+# Include: Declaration of run-virt default variables #
+######################################################
+
+VMCHOOSER_DIR="/opt/openslx/vmchooser"
+VMCHOOSER_CONF_DIR="$VMCHOOSER_DIR/config"
+LOGFILE="/var/log/openslx/run-virt.${USER}.$$.log"
+USER="$(whoami)"
+TMPDIR="/tmp/virt/${USER}/$$"
+
+readonly VMCHOOSER_DIR VMCHOOSER_CONF_DIR LOGFILE TMPDIR USER
+
+# include general configuration from vmchooser
+[ -f "$VMCHOOSER_CONF_DIR/vmchooser.conf" ] && . "$VMCHOOSER_CONF_DIR/vmchooser.conf"
+# load general virtualization information
+[ -f "$VMCHOOSER_CONF_DIR/virtualization.conf" ] && . "$VMCHOOSER_CONF_DIR/virtualization.conf"
+# Load general openslx config
+[ -f "/opt/openslx/config" ] && . "/opt/openslx/config"
+# Create temp dir
+if ! mkdir -p "$TMPDIR"; then
+	slxlog "virt-tmpdir" "Could not create temporary directory '$TMPDIR' for session"
+	error_user "Konnte kein temporäres Arbeitsverzeichnis für die VM-Sitzung anlegen. Ein Computer-Neustart könnte das Problem lösen."
+	cleanexit 1
+	exit 1
+fi
+
diff --git a/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_firewall.inc b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_firewall.inc
new file mode 100644
index 00000000..f0820ed7
--- /dev/null
+++ b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_firewall.inc
@@ -0,0 +1,12 @@
+
+setup_firewall () {
+	local LOGF="${TMPDIR}/firewall.log"
+	local RET
+	[ "$DISPLAY" = ":0" ] || return 0 # For now, to avoid conflicts, we only do this on display :0
+	slxfwtool "$IMGUUID" > "$LOGF" 2>&1
+	RET=$?
+	if [ "$RET" != "0" ]; then
+		slxlog "runvirt-firewall" "Error setting up firewall rules for lecture $IMGUUID (Exit code $RET)" "$LOGF"
+	fi
+	return 0
+}
diff --git a/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_image_access.inc b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_image_access.inc
new file mode 100644
index 00000000..3c4ed330
--- /dev/null
+++ b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_image_access.inc
@@ -0,0 +1,71 @@
+###########################################################
+# Include: Setup dnbd for image access, nfs/cifs fallback #
+###########################################################
+
+writelog "Now in setup_image_access.inc ..."
+
+# Try to use dnbd3 to access the image
+unset vm_diskfile
+unset vm_revision
+unset dnbd3_fuse_mount_point
+unset dnbd3_tmplog
+if ! which dnbd3-fuse; then
+	writelog "Can't use dnbd3 as dnbd3-fuse binary is not in PATH"
+elif [ -z "$SLX_DNBD3_SERVERS" ] || [ "x$SLX_VM_DNBD3" != "xyes" ]; then
+	writelog "Can't use dnbd3 as no servers are given in config, or SLX_VM_DNBD3 is not set to yes"
+else
+	# Mount path for images mounted with dnbd3-fuse
+	dnbd3_fuse_mount_point="$TMPDIR/dnbd3fuse.mnt"
+	mkdir -p "${dnbd3_fuse_mount_point}"
+	# start dnbd3-fuse in subshell
+	dnbd3_tmplog="$TMPDIR/dnbd3fuse.log"
+	dnbd3_exitflag="$TMPDIR/dnbd3exit$RANDOM"
+	rm -f -- "$dnbd3_exitflag"
+	(
+		dnbd3-fuse -f -o allow_other,max_readahead=262144 -h "$SLX_DNBD3_SERVERS" -i "${imgrelpath}" "${dnbd3_fuse_mount_point}" > "$dnbd3_tmplog" 2>&1
+		RET=$?
+		touch "$dnbd3_exitflag"
+		if [ "$RET" != "0" ]; then
+			writelog "dnbd3-fuse stopped working (Exit code $RET)"
+			slxlog "virt-dnbd3-fuse" "dnbd3-fuse stopped/refused serving '${imgrelpath}' from '${SLX_DNBD3_SERVERS}' with error code: $RET" "${dnbd3_tmplog}"
+		fi
+	) &
+	# give it a bit of time
+	usleep 250000
+	# check if we have the image
+	for TIMEOUT in 0.5 1 1 OUT; do
+		if [ -r "${dnbd3_fuse_mount_point}/img" ]; then
+			vm_revision="$(grep -m 1 "^Revision:" "${dnbd3_fuse_mount_point}/status" | cut  -d" " -f2)"
+			vm_diskfile="${dnbd3_fuse_mount_point}/img"
+			writelog "DNBD3: $imgrelpath on $vm_diskfile with rid $vm_revision"
+			vmpath="$vm_diskfile"
+			break
+		fi
+		[ "$TIMEOUT" = "OUT" -o -e "$dnbd3_exitflag" ] && break
+		sleep "$TIMEOUT"
+	done
+
+	if [ -z "$vm_diskfile" ]; then
+		slxlog "virt-dnbd3" "No dnbd3 server for ${imgrelpath} found, trying NFS/CIFS..." "$dnbd3_tmplog"
+		writelog "No working dnbd3 server found :-("
+	fi
+fi
+
+# $vm_diskfile will be empty if dnbd3 is not used or failed. Let's try to fall back to NFS/CIFS via file system
+if [ -z "$vm_diskfile" ]; then
+	new_vmpath=$(ls "${vmpath}.r"* | grep -E -o '\.r[0-9]+$' | grep -o -E '[0-9]+' | sort -n | tail -n 1)
+	[ -n "$new_vmpath" ] && vmpath="${vmpath}.r${new_vmpath}"
+	vm_diskfile="$vmpath"
+fi
+
+# Check if virtual machine container file exists
+if ! [ -e "${vmpath}" ]; then
+	slxlog "virt-image-missing" "VM image $vmpath not found!"
+	writelog "Virtual machine image ${vmpath} not found!"
+	error_user "Das Image für die gewählte Virtuelle Maschine konnte nicht gefunden werden.
+Versuchen Sie zunächst, den Computer komplett neu zu starten. Sollte das Problem bestehen bleiben, wenden Sie sich bitte an den Support."
+	cleanexit 1
+fi
+
+writelog "Virtual machine disk file: $vm_diskfile"
+
diff --git a/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_printer_lpd.inc b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_printer_lpd.inc
new file mode 100644
index 00000000..2fb9310a
--- /dev/null
+++ b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_printer_lpd.inc
@@ -0,0 +1,46 @@
+#####################################
+# Include: Setup printer daemon LPD #
+#####################################
+
+QUEUE="STANDARD" # This has to match the queue you configured in your VM
+SPOOLDIR=
+
+### Disabled: 100megs is not enough, some jobs are HUGE, try to use temp which should be on disk
+## Try using user's tmpfs home first, as it gets wiped on logout
+#if [ -n "${HOME}" ] && [ -w "${HOME}" ]; then
+#       SPOOLDIR="${HOME}/.spool"
+#       mkdir -p "${SPOOLDIR}/${QUEUE}"
+#fi
+# If failed, try to fall back to /tmp
+
+if [ -z "${SPOOLDIR}" ] || [ ! -w "${SPOOLDIR}/${QUEUE}" ]; then
+	SPOOLDIR="${TMPDIR}/printergui-${RANDOM}"
+	rm -rf -- "${SPOOLDIR}"
+	if ! mkdir -p "${SPOOLDIR}/${QUEUE}"; then
+		slxlog "virt-spooldir" "Could not create spool directory ($SPOOLDIR) for $USER - printing will not work!"
+		# TODO: Warn user
+	fi
+	chmod 0700 "${SPOOLDIR}/${QUEUE}"
+fi
+
+# Start the lpdaemon listening on the given port
+# TODO: externalize with something like runvirt.d (other parts might benefit from that too)
+tcpsvd -E 192.168.101.1 5515 \
+	lpd "$SPOOLDIR" \
+	ash -c "/opt/openslx/scripts/run-virt_print '${USER}' \"${SPOOLDIR}/${QUEUE}/\$DATAFILE\"" &
+
+# PID to kill the process
+PID_LPD="$!"
+
+{
+	sleep 2
+	# Check if tcpsvd is running. Do this a little delayed so we do not check
+	# immediately after trying to spawn it, as this could result in
+	# success even if it's not really working.
+
+	if ! kill -0 "$PID_LPD"; then
+		slxlog "virt-lpd" "Could not start tcpsvd/lpd for virtual machine session"
+		notify_user "Durcksystem" "Das Drucksystem konnte nicht initialisiert werden. Druckfunktion nicht verfügbar."
+	fi
+} &
+
diff --git a/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_sound.inc b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_sound.inc
new file mode 100644
index 00000000..6230aa3a
--- /dev/null
+++ b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_sound.inc
@@ -0,0 +1,65 @@
+#!/bin/bash <-- Add shebang even though it's sourced so vim highlights bash specific features properly
+########################
+# Include: Setup sound #
+########################
+# 8086:1e20: Sound card in bwPX4
+
+writelog "Starting sound setup ..."
+
+if lspci -n | grep -E -i '8086:1e20( |$)'; then
+	VOL="100%" # bwPC 4: Speaker too quiet :-(
+else
+	VOL="85%"
+fi
+
+if true; then
+	# detecting which card is to be used
+	writelog "Detecting which sound card to use ..."
+	PROC="/proc/asound/cards"
+	if [ ! -r "$PROC" ]; then
+		writelog "'${PROC}' not found or not readable."
+		SOUND_CARD_INDEX=0
+		SOUND_CARD_COUNT=1
+	else
+		# Try to filter HDMI cards first
+		SOUND_CARD_INDEX=$(grep -v -i 'HDMI' "${PROC}" | grep -E -o '^[[:space:]]{0,2}[0-9]+[[:space:]]+' | head -n 1)
+		# If empty, try again with all
+		[ -z "${SOUND_CARD_INDEX}" ] && SOUND_CARD_INDEX=$(cat "${PROC}" | grep -E -o '^[[:space:]]{0,2}[0-9]+[[:space:]]+' | head -n 1)
+		if [ -z "${SOUND_CARD_INDEX}" ]; then
+			writelog "No sound card found."
+			SOUND_CARD_INDEX=0
+		fi
+		SOUND_CARD_COUNT=$(grep -E '^[[:space:]]{0,2}[0-9]+[[:space:]]+' "${PROC}" | wc -l)
+	fi
+	
+	SOUND_CARD_INDEX="$(grep -E -o '[0-9]+' <<<$SOUND_CARD_INDEX)"
+	writelog "Detected sound card index is: $SOUND_CARD_INDEX"
+	writelog "Sound card count: $SOUND_CARD_COUNT"
+	
+	# Adjust sound volume (playback)... Random mixer names we have encountered during testing
+	writelog "Setting up volume..."
+	amixer -q -c "$SOUND_CARD_INDEX" sset 'Master' "$VOL" unmute
+	amixer -q -c "$SOUND_CARD_INDEX" sset 'PCM' "$VOL" unmute
+	amixer -q -c "$SOUND_CARD_INDEX" sset 'CD' "$VOL" unmute
+	amixer -q -c "$SOUND_CARD_INDEX" sset 'Headphone' "$VOL" unmute
+	amixer -q -c "$SOUND_CARD_INDEX" sset 'Front' "$VOL" unmute
+	amixer -q -c "$SOUND_CARD_INDEX" sset 'Speaker' "$VOL" unmute
+	# Recording. It seems that (most) devices need the volume set to 0, so you
+	# don't hear your own mic input, but should be unmuted. Also on some cards,
+	# you need to set the cap option on the mic you want to use, while other cards
+	# will just ignore that option.
+	# Plus, most cards have a Capture mixer, which needs to be set to cap too, and
+	# have its volume turned up. (There'll probably be some cards that need yet
+	# another setup, but this works for now on 4 tested cards)
+	amixer -q -c "$SOUND_CARD_INDEX" sset 'Rear Mic Boost' "50%" cap unmute
+	amixer -q -c "$SOUND_CARD_INDEX" sset 'Rear Mic' "0%" cap unmute
+	amixer -q -c "$SOUND_CARD_INDEX" sset 'Front Mic Boost' "50%" cap unmute
+	amixer -q -c "$SOUND_CARD_INDEX" sset 'Front Mic' "0%" cap unmute
+	amixer -q -c "$SOUND_CARD_INDEX" sset 'Mic Boost' "50%" cap unmute
+	amixer -q -c "$SOUND_CARD_INDEX" sset 'Mic' "0%" cap unmute
+	amixer -q -c "$SOUND_CARD_INDEX" sset 'Capture' "100%" cap unmute
+	amixer -q -c "$SOUND_CARD_INDEX" sset 'Input Source' 'Front Mic' # Let's hope nobody uses rear mic...
+	# fix random static noise when starting vmplayer when module snd_pcsp (not pcspkr) is loaded
+	amixer -q -c pcsp sset Master "0%" mute
+	writelog "Done setting up volume."
+fi >> "${LOGFILE}" 2>&1
diff --git a/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_virtual_floppy.inc b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_virtual_floppy.inc
new file mode 100644
index 00000000..d9ae052c
--- /dev/null
+++ b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_virtual_floppy.inc
@@ -0,0 +1,101 @@
+#!/bin/bash
+##############################################
+# Include: Setup virtual floppy for drive b: #
+##############################################
+
+declare -rg FLOPPYIMG="${TMPDIR}/floppy.img"
+declare -rg TMPHOME="${HOME}"
+declare -rg RUNSCRIPT="${TMPDIR}/runscript.tmp"
+
+wget -T 6 -O "${RUNSCRIPT}" "${SLX_VMCHOOSER_BASE_URL}/lecture/${IMGUUID}/runscript" > /dev/null &
+WGET=$!
+
+dd "if=/dev/zero" "of=${FLOPPYIMG}" count=1440 bs=1024
+chmod 0600 "${FLOPPYIMG}"
+mkfs.fat "${FLOPPYIMG}" || mkfs.vfat "${FLOPPYIMG}" || mkdosfs "${FLOPPYIMG}"
+
+# Create file with resolution information etc.
+. "/opt/openslx/inc/shares"
+if [ -z "$SHARE_REMAP_MODE" ]; then
+	SHARE_REMAP_MODE_INI="0"
+	SHARE_REMAP_MODE="3"
+else
+	SHARE_REMAP_MODE_INI="$SHARE_REMAP_MODE"
+fi
+[ -z "$SHARE_CREATE_MISSING_REMAP" ] && SHARE_CREATE_MISSING_REMAP="1"
+declare -rg RESOLUTION=$(xrandr | grep -o -E 'connected\s*(primary)?\s*[0-9]+x[0-9]+\+0\+0' \
+	| grep -o -E -m1 '[0-9]+x[0-9]+')
+
+# Legacy: HOSTRES.TXT
+cat > "${TMPDIR}/HOSTRES.TXT" <<-HIER
+${RESOLUTION}
+HIER
+
+# Create file for network shares to mount
+declare -rg SHARES="${TMPDIR}/shares.dat"
+touch "${SHARES}"
+chmod 0600 "${SHARES}"
+if ! pwdaemon --query "${TMPHOME}/.pwsocket" > "${SHARES}"; then
+	slxlog "virt-pwdaemon" "Could not start pwdaemon"
+else
+	sed -i 's/^/192.168.101.1\t/' "${SHARES}" # TODO: Depending on nettype (in case we have != nat some day)
+	if [ "${SHARE_REMAP_MODE}" = 1 -o "${SHARE_REMAP_MODE}" = 2 ] && [ -e "${TMPHOME}/.home" ]; then
+		NETHOME=$(cat "${TMPHOME}/.home")
+		[ -z "$SHARE_HOME_DRIVE" ] && SHARE_HOME_DRIVE="H:"
+		# Tab between items, so spaces can be used!
+		echo "${NETHOME}	${SHARE_HOME_DRIVE}	Home-Verzeichnis" >> "${SHARES}"
+	fi
+	for VAR in ${!SHARE_LINE_*}; do
+		echo "${!VAR}" >> "${SHARES}"
+	done
+fi
+
+wait "$WGET"
+
+# Check downloaded runscript, handle extension marker
+EXT=
+if [ -s "$RUNSCRIPT" ]; then
+	EXT=$(head -n 1 "$RUNSCRIPT" | grep -o -i '^EXT=.*$' | cut -d '=' -f 2-)
+	[ -n "$EXT" ] && [ "x${EXT:0:1}" != "x." ] && EXT=".$EXT"
+fi
+
+# Write info file
+UNAME=
+[ -s "${HOME}/.account" ] && UNAME=$(cat "${HOME}/.account")
+[ -z "${UNAME}" ] && UNAME=$(whoami)
+cat > "${TMPDIR}/openslx.ini" <<-HIER
+[openslx]
+username=${UNAME}
+resolution=${RESOLUTION}
+createMissingRemap=${SHARE_CREATE_MISSING_REMAP}
+remapMode=${SHARE_REMAP_MODE_INI}
+homeDrive=${SHARE_HOME_DRIVE}
+scriptExt=${EXT}
+
+[remap]
+documents=${SHARE_DOCUMENTS}
+downloads=${SHARE_DOWNLOADS}
+desktop=${SHARE_DESKTOP}
+media=${SHARE_MEDIA}
+other=${SHARE_OTHER}
+HIER
+
+# Copy all them there filez into floppy image
+mcopy -i "${FLOPPYIMG}" "${TMPDIR}/openslx.ini" "${TMPDIR}/HOSTRES.TXT" "${SHARES}" "::/"
+mcopy -i "${FLOPPYIMG}" "$VMCHOOSER_DIR/data/openslx.exe" "::/"
+# Copy guest configuration (with added information) config.xml to be accessed
+# via virtual floppy
+mcopy -i "${FLOPPYIMG}" "$xmlfile" "::/config.xml"
+
+# Copying linux directory:
+mcopy -s -i "${FLOPPYIMG}" "$VMCHOOSER_DIR/data/linux" "::/"
+
+# User supplied runscript
+if [ -n "$EXT" ]; then
+	sed -i '1d' "${RUNSCRIPT}"
+	mcopy -i "${FLOPPYIMG}" "${RUNSCRIPT}" "::/runscript${EXT}"
+fi
+
+rm -f -- "${SHARES}" "${TMPDIR}/openslx.ini" "${TMPDIR}/HOSTRES.TXT"
+unset SHARES VAR NETHOME UNAME
+
diff --git a/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_vm_hypervisor.inc b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_vm_hypervisor.inc
new file mode 100644
index 00000000..ce15524f
--- /dev/null
+++ b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_vm_hypervisor.inc
@@ -0,0 +1,34 @@
+##########################################################################
+# Include: Setup virtual machine hypervisor via vm-specific include file #
+##########################################################################
+
+# Get all virtual machine specific stuff from the respective include file
+if [ ! -e "$VMCHOOSER_DIR/$xmlvirt/run-virt.include" ] ; then
+	slxlog "virt-plugin-missing" "Could not find run-virt.include for $xmlvirt ($VMCHOOSER_DIR/$xmlvirt/run-virt.include)"
+	writelog "Failed because of missing ${xmlvirt} plugin."
+	error_user "Konnte den Virtualisierer '$xmlvirt' nicht finden. Starten der Virtuellen Maschine fehlgeschlagen.
+	Starten Sie den Computer neu und wenden Sie sich an den Support, wenn das Problem weiterhin besteht."
+	cleanexit 1
+fi
+
+self="${xmlvirt}"
+
+if ! bash -n "$VMCHOOSER_DIR/$xmlvirt/run-virt.include"; then
+	slxlog "virt-plugin-syntax" "run-virt.include for $xmlvirt contains syntax errors (bash -n run-virt.include failed)"
+	writelog "Erroneous run-virt.include for $xmlvirt (syntax check)"
+	error_user "Das Start-Script für den Virtualisierer '$xmlvirt' ist fehlerhaft.
+	Starten Sie den Computer neu und wenden Sie sich an den Support, wenn das Problem weiterhin besteht."
+	cleanexit 1
+fi
+
+setup_vm_commandline () {
+	# Now including the hypervisor specific include file:
+	if ! source "$VMCHOOSER_DIR/$xmlvirt/run-virt.include"; then
+		slxlog "virt-plugin-error" "run-virt.include for $xmlvirt could not be sourced properly."
+		writelog "Erroneous run-virt.include for ${xmlvirt}? Source returned != 0"
+		error_user "Das Start-Script für den Virtualisierer '$xmlvirt' hat einen fehlercode zurückgegeben.
+		Starten Sie den Computer neu, falls es beim Ausführen der VM zu Problemen kommt
+		und wenden Sie sich an den Support, wenn das Problem weiterhin besteht."
+	fi
+}
+
diff --git a/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/start_windowmanager.inc b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/start_windowmanager.inc
new file mode 100644
index 00000000..da43f341
--- /dev/null
+++ b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/start_windowmanager.inc
@@ -0,0 +1,27 @@
+####################################################
+# Include: Start windowmanager for easier handling #
+####################################################
+
+# Some problems may arise with windows opening in background when
+# using eg. vmware without a window manager.
+
+FOUND_WM=
+for dm in openbox kwin xfwm4 metacity blackbox twm fvwm2 ; do
+	if which $dm >/dev/null 2>&1 ; then
+		if [ "$dm" = "fvwm2" ] ; then
+			echo "EdgeScroll 0 0" > ${redodir}/fvwm
+			writelog "Starting fvwm2."
+			fvwm2 -f ${redodir}/fvwm >/dev/null 2>&1 &
+		else
+			writelog "Starting ${dm}."
+			$dm >/dev/null 2>&1 &
+		fi
+		FOUND_WM=1
+		break
+	fi
+done
+
+if [ -z "$FOUND_WM" ]; then
+	slxlog "virt-windowmanager" "Could not find any window manager to use!"
+	notify_user "Konnte keinen Window Manager finden. (Das ist schlecht!)"
+fi
diff --git a/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/usb_detector.inc b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/usb_detector.inc
new file mode 100644
index 00000000..a2d442e4
--- /dev/null
+++ b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/usb_detector.inc
@@ -0,0 +1,77 @@
+# Helper function that will scan /dev/bus/usb for devices matching specific classes
+# and then output the corresponding device ids. This can be used for selective
+# handover of devices to a virtual machine
+
+declare -rg PASSTHROUGH_USB_DEVICES="2 0:5 0:6 0:7 0:14 0:16 0:17 239"
+
+# $1: expression to fill with device information.
+#     valid placeholders are:
+#     %VENDOR%  - device vendor id
+#     %PRODUCT% - device product id
+# $2-n: device classes to include in output
+get_usb_devices_int() {
+	[ -z "$TMPDIR" ] && TMPDIR="/tmp"
+	local EXP=$1
+	shift
+	if [ -z "$EXP" ]; then
+		writelog --quiet "No ouput expression template passed to get_usb_devices"
+		cleanexit 1
+	fi
+	if [ $# -eq 0 ]; then
+		writelog --quiet "No device classes given to get_usb_devices"
+		cleanexit 1
+	fi
+	local MATCH=';'
+	while [ $# -gt 0 ]; do
+		MATCH+="$1;"
+		[[ "$1" != *:* ]] && MATCH+="0:$1;"
+		shift
+	done
+	local dev=
+	local key value trailing
+	trailing=
+	local tmp="${TMPDIR}/lsusb.$$.$RANDOM"
+	for dev in /dev/bus/usb/*/*; do
+		if ! lsusb -D "$dev" > "$tmp" 2>/dev/null; then
+			writelog --quiet "Cannot lsusb $dev"
+			continue
+		fi
+		local DC=
+		local OK=
+		local VENDOR=
+		local PRODUCT=
+		while read -r key value trailing || [ -n "$key" ]; do
+			if [[ "$key" == "idVendor" ]]; then
+				[[ "$value" == 0x* ]] && VENDOR="${value:2}"
+			elif [[ "$key" == "idProduct" ]]; then
+				[[ "$value" == 0x* ]] && PRODUCT="${value:2}"
+			elif [ -z "$DC" ]; then
+				# No bDeviceClass seen yet
+				if [[ "$key" == "bDeviceClass" ]]; then
+					DC="$value"
+					[[ "$MATCH" == *";${DC};"* ]] && OK=yo
+				fi
+			else
+				# #DeviceClass is generic, look at sub class
+				if [[ "$key" == "bInterfaceClass" ]]; then
+					[[ "$MATCH" == *";${DC}:${value};"* ]] && OK=yo
+				fi
+			fi
+			if [ -n "$OK" -a -n "$VENDOR" -a -n "$PRODUCT" ]; then
+				echo "$EXP" | sed "s/%VENDOR%/${VENDOR}/g;s/%PRODUCT%/${PRODUCT}/g"
+				break
+			fi
+		done < "$tmp"
+	done
+	rm -f -- "$tmp"
+}
+
+get_usb_devices() {
+	if which lsusb 2>/dev/null >&2 && lsusb --help 2>&1 | grep -q -- '-D' 2>/dev/null; then
+		[ $# -eq 1 ] && set -- "$1" $PASSTHROUGH_USB_DEVICES # no quotes here!
+		get_usb_devices_int "$@" | sort -u
+	else
+		writelog --quiet "Cannot scan usb bus: lsusb not found or doesn't support -D"
+	fi
+}
+
diff --git a/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/vmchooser_runvirt_functions.inc b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/vmchooser_runvirt_functions.inc
new file mode 100644
index 00000000..c0d17dbe
--- /dev/null
+++ b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/vmchooser_runvirt_functions.inc
@@ -0,0 +1,79 @@
+#######################################################
+# Include: Set functions needed by vmchooser-run_virt #
+#######################################################
+
+# function to write to stdout and logfile
+writelog() {
+	local DATE=$(date +%Y-%m-%d-%H-%M-%S)
+	# write to stdout?
+	if [ "x$1" = "x--quiet" ]; then
+		shift
+	else
+		echo -e "$DATE: $@"
+	fi
+	# log into file
+	echo -e "$DATE: $@" >> "${LOGFILE}"
+}
+
+notify_user() {
+	local TOPIC="$1"
+	shift
+	notify-send -u normal "$TOPIC" "$@"
+	writelog "Notify: **${TOPIC}**: $*"
+}
+
+error_user() {
+	local TOPIC="$1"
+	shift
+	local MSG TITLE BODY
+	if [ $# -gt 0 ]; then
+		MSG="   $TOPIC
+$*"
+		TITLE="$TOPIC"
+		BODY="$*"
+	else
+		MSG="$TOPIC"
+		TITLE="ERROR"
+		BODY="$TOPIC"
+	fi
+	# Zenity should yield the nicest result
+	zenity --error --title "$TITLE" --text "$BODY" && return
+	# QnD abuse printergui for error message as it's blocking
+	/opt/openslx/cups/printergui --error "$MSG" && return
+	# printergui might not exist, try fallback here
+	# unfortunately, i can only think of notify+sleep right now
+	notify-send -u critical "$TITLE" "$BODY"
+	sleep 10
+}
+
+# Clean exit will be called at the end of vmchooser-run_virt
+cleanexit() {
+	sleep 1
+	# Ummount dnbd3-fuse
+	if [ -n "$dnbd3_fuse_mount_point" ] && [ -e "$dnbd3_fuse_mount_point/img" ]; then
+		for timeout in 1 1 1 FAIL; do
+			fusermount -u "$dnbd3_fuse_mount_point" && break
+			writelog "dnbd3 still busy...."
+			[ "$timeout" = "FAIL" ] && break
+			sleep "$timeout"
+		done
+	fi
+	# Kill LPD
+	[ -n "${PID_LPD}" ] && kill "${PID_LPD}"
+
+	# If we're not in debug mode, remove all temporary files
+	if [ -n "${TMPDIR}" -a -z "$SLX_DEBUG" ]; then
+		rm -rf -- "${TMPDIR}"
+	fi
+
+	[ $# -gt 0 ] && exit "$1"
+	exit 129 # No exit code was given :/
+}
+
+rv_clean_string() {
+	if [ "$#" -ge 1 ]; then
+		echo "$@" | tr '[A-Z]' '[a-z]' | tr -d -c '[a-z0-9\-]'
+	else
+		tr '[A-Z]' '[a-z]' | tr -d -c '[a-z0-9\-]'
+	fi
+}
diff --git a/remote/modules/run-virt/data/opt/openslx/vmchooser/vmchooser-run_virt b/remote/modules/run-virt/data/opt/openslx/vmchooser/vmchooser-run_virt
new file mode 100755
index 00000000..10943c51
--- /dev/null
+++ b/remote/modules/run-virt/data/opt/openslx/vmchooser/vmchooser-run_virt
@@ -0,0 +1,116 @@
+#!/bin/bash
+# Full bash required
+# -----------------------------------------------------------------------------
+# Copyright (c) 2007..2010 - RZ Uni FR
+# Copyright (c) 2007..2013 - OpenSLX GmbH
+#
+# This program is free software distributed under the GPL version 2.
+# See http://openslx.org/COPYING
+#
+# If you have any feedback please consult http://openslx.org/feedback and
+# send your suggestions, praise, or complaints to feedback@openslx.org
+#
+# General information about OpenSLX can be found at http://openslx.org/
+# -----------------------------------------------------------------------------
+# run-virt.sh
+#    - This is the generic wrapper for the several virtualization solutions.
+#      The idea is to setup a set of variables used by at least two different
+#      tools and then include the specific plugin which configures the speci-
+#      fied virtualization tool.
+################################################################################
+
+RUNVIRTINCLUDEDIR=/opt/openslx/vmchooser/run-virt-includes
+xmlfile="$1"
+
+# Functions needed by vmchooser-run_virt (writelog(), cleanexit(), rv_clean_string())
+if ! source "${RUNVIRTINCLUDEDIR}/vmchooser_runvirt_functions.inc"; then
+	slxlog "run-virt" "Could not source ${RUNVIRTINCLUDEDIR}/vmchooser_runvirt_functions.inc"
+	exit 1
+fi
+
+trap 'trap "" SIGINT SIGTERM; cleanexit' SIGINT SIGTERM
+# Define default dirs / get configs
+source "${RUNVIRTINCLUDEDIR}/set_runvirt_variables.inc"
+# Function to detect whether we can use the new way (vmx via http) or the old way (legacy):
+source "${RUNVIRTINCLUDEDIR}/detect_legacy.inc" # This yields LEGACY, IMGUUID, IMGVMX
+
+if [ "$LEGACY" ]; then
+
+	# No longer supported - yay
+
+	error_user "Legacy Mode" "
+Die gewählte VM ist eine 'Legacy VM', für die unvollständige
+Metadaten auf dem bwLehrpool-Server hinterlegt sind. Diese
+werden nicht mehr unterstützt. Um diese VM weiterhin nutzen
+zu können, muss sie mittels der bwLehrpool-Suite heruntergeladen,
+einmal gebootet, und wieder hochgeladen werden.
+(Bei der Gelegenheit könnten z.B. auch gleich anfallende Updates
+eingespielt werden.)
+"
+	cleanexit 1
+
+	# End legacy warning
+fi
+
+# Proper meta data received - proceed normally
+
+# check for important files used (filecheck()) - vestigial?
+# This include does not currently work. TODO.
+# source ${RUNVIRTINCLUDEDIR}/check_runvirt_needed_files.inc && filecheck
+
+# Read needed variables from XML file
+source ${RUNVIRTINCLUDEDIR}/get_xml_file_variables.inc
+
+# Helper that looks for virtualizer-specific include, show error to user if not found
+source "${RUNVIRTINCLUDEDIR}/setup_vm_hypervisor.inc"
+
+# For scanning for certain usb classes
+source "${RUNVIRTINCLUDEDIR}/usb_detector.inc"
+
+# Firewall
+source "${RUNVIRTINCLUDEDIR}/setup_firewall.inc" || writelog "Could not source setup_firewall"
+setup_firewall || writelog "Could not run setup_firewall"
+
+# Sound setup
+source ${RUNVIRTINCLUDEDIR}/setup_sound.inc
+
+# Declaration of hardware relatedt variables
+source ${RUNVIRTINCLUDEDIR}/set_runvirt_hardware_variables.inc
+
+# Start printer daemon
+source ${RUNVIRTINCLUDEDIR}/setup_printer_lpd.inc
+
+# Setup virtual floppy b: for windows guests with config.xml, openslx.exe etc.
+source ${RUNVIRTINCLUDEDIR}/setup_virtual_floppy.inc
+
+# Try to use dnbd3 to access the image, nfs/cifs fallback
+source ${RUNVIRTINCLUDEDIR}/setup_image_access.inc
+
+# Window manager required for handling of popups etc.
+source ${RUNVIRTINCLUDEDIR}/start_windowmanager.inc
+
+# Source run-virt.include of virtualizer
+setup_vm_commandline
+
+# It should have set this variable if all went well
+if [ -z "${VIRTCMD}" ]; then
+	error_user "Fehler beim Starten der VM-Sitzung" "
+Das Start-Script für den Virtualisierer $xmlvirt hat kein Kommando
+zum Starten der Sitzung definiert. Kann Sitzung nicht initialisieren."
+	slxlog "virt-plugin-error" "run-virt.include for $xmlvirt did not set VIRTCMD"
+	cleanexit 1
+fi
+
+writelog "VM command: eval ${VIRTCMD} ${VIRTCMDOPTS}"
+# This will start the VM
+eval ${VIRTCMD} ${VIRTCMDOPTS}
+
+writelog "Virtualizer exited. Bye."
+
+# Postrun for commands after virtualization finishes
+if [ -n "${POSTRUN}" ]; then
+	eval ${POSTRUN}  >/dev/null 2>&1
+fi
+
+cleanexit 0
+
diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmware_config_file_legacy.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmware_config_file_legacy.inc
deleted file mode 100644
index df6e6f39..00000000
--- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmware_config_file_legacy.inc
+++ /dev/null
@@ -1,316 +0,0 @@
-########################################
-# Include: Create vmware startup files #
-########################################
-
-create_vmware_config_file_legacy() {
-	echo "# This configuration file was generated by $0" > "$conffile"
-
-	MAXMEM="9999999"
-	MAXCORES="4"
-	shfolders="TRUE"
-	sound="es1371"
-
-	# define hardware configuration depending on the guest OS used
-	# this needs to be fixed and is the base for the creation of new VMs
-	case "$vmostype" in
-		win31*|windows31*)
-			vmostype="win31"
-			shfolders="FALSE"
-			sound="sb16"
-			MAXMEM="32"
-			MAXCORES="1"
-		;;
-		winnt*|windowsnt*)
-			vmostype="winnt"
-			shfolders="FALSE"
-			sound="sb16"
-			MAXMEM="1000"
-			MAXCORES="2"
-		;;
-		win95*|windows95*)
-			vmostype="win95"
-			shfolders="FALSE"
-			MAXMEM="96"
-			MAXCORES="1"
-		;;
-		win98*|windows98*)
-			vmostype="win98"
-			MAXMEM="256"
-			MAXCORES="1"
-		;;
-		winme*|windowsme*)
-			vmostype="winme"
-			MAXMEM="384"
-			MAXCORES="1"
-		;;
-		win2000|windows2000|win2000pro*)
-			vmostype="win2000pro"
-			MAXMEM="4000"
-			MAXCORES="2"
-		;;
-		win2000srv*|windows2000srv*|win2000serv*|windows2000serv*)
-			vmostype="win2000serv"
-			shfolders="FALSE"
-			MAXMEM="4000"
-			MAXCORES="4"
-		;;
-		win2000adv*|windows2000adv*|win2000dat*|windows2000dat*)
-			vmostype="win2000advserv"
-			shfolders="FALSE"
-			MAXMEM="8000"
-			MAXCORES="8"
-		;;
-		winnet*64|win*2003*64|windowsnet*64)
-			vmostype="winnetstandard-64"
-			MAXMEM="8000"
-		;;
-		winnet*|win*2003*|windowsnet*)
-			vmostype="winnetstandard"
-			MAXMEM="4000"
-		;;
-		winxphome*|windowsxphome*)
-			vmostype="winxphome"
-			MAXMEM="4000"
-			MAXCORES="1"
-		;;
-		winxp*64|windowsxp*64)
-			vmostype="winxppro-64"
-			MAXMEM="8000"
-			MAXCORES="2"
-		;;
-		winxp*|windowsxp*)
-			vmostype="winxppro"
-			MAXMEM="4000"
-			MAXCORES="1"
-		;;
-		winvista*64|windowsvista*64)
-			vmostype="winvista-64"
-			MAXMEM="16000"
-			MAXCORES="2"
-		;;
-		winvista*|windowsvista*)
-			vmostype="winvista"
-			MAXMEM="8000"
-			MAXCORES="2"
-		;;
-		win7*64|windows7*64)
-			vmostype="windows7-64"
-			MAXMEM="32000"
-			MAXCORES="4"
-		;;
-		win7*|windows7*)
-			vmostype="windows7"
-			MAXMEM="8000"
-			MAXCORES="4"
-		;;
-		win8*64|windows8*64)
-			vmostype="windows8-64"
-			MAXMEM="32000"
-			MAXCORES="4"
-		;;
-		win8*|windows8*)
-			vmostype="windows8"
-			MAXMEM="8000"
-			MAXCORES="4"
-		;;
-		win*64)
-			MAXMEM="16000"
-			MAXCORES="4"
-		;;
-		win*)
-			MAXMEM="8000"
-		;;
-		dos|msdos*|ms-dos*)
-			vmostype="dos"
-			shfolders="FALSE"
-			MAXMEM="128"
-		;;
-		macos*64)
-			vmostype="freebsd-64"
-			MAXMEM="4000"
-			MAXCORES="2"
-		;;
-		macos*)
-			vmostype="freebsd"
-			MAXMEM="4000"
-			MAXCORES="1"
-		;;
-		beos*)
-			vmostype="other"
-			shfolders="FALSE"
-		;;
-		# Unknown guestOS setting in .xml - use conservative defaults
-		*64)
-			vmostype="other-64"
-			shfolders="FALSE"
-			MAXMEM="123456"
-			MAXCORES="4"
-		;;
-		*)
-			vmostype="other"
-			shfolders="FALSE"
-			MAXMEM="8000"
-			MAXCORES="1"
-		;;
-	esac
-	real_core_count="$cpu_cores"
-	[ "$cpu_cores" -gt "$MAXCORES" ] && cpu_cores="$MAXCORES"
-	# It currently makes no sense to set the virtual number of cores
-	# to a different value than the virtual number of cores per virtual CPU.
-	cores_per_socket="$cpu_cores"
-
-	if [ "x$shfolders" != "xFALSE" ] && [ "$SHARE_REMAP_MODE" != 1 ]; then
-		enable_share='sharedFolder.option = "alwaysEnabled"'
-		HGFS_DISABLED="FALSE"
-	else
-		enable_share=
-		HGFS_DISABLED="TRUE"
-	fi
-
-	[ "$mem" -ge "$MAXMEM" ] && mem="$MAXMEM"
-	[ "$hwver" -lt "7" -a "$mem" -gt "3500" ] && mem="3500"
-
-	if [ -n "$FLOPPYIMG" ]; then
-		floppy1="TRUE"
-	else
-		floppy1="FALSE"
-	fi
-
-	cat >> "$conffile" <<-HEREEND
-		.encoding = "UTF-8"
-		config.version = "8"
-
-		# general hardware (ehci, 3d accel)
-		ehci.present = "TRUE"
-		$FORCE3D
-		mks.enable3d = "$enable3d"
-
-		monitor.virtual_mmu = "automatic"
-		monitor.virtual_exec = "automatic"
-
-		# id
-		virtualHW.version = "$hwver"
-		displayName = "$displayname"
-		guestOS = "$vmostype"
-
-		# CPU/MEM
-		numvcpus = "$cpu_cores"
-		cpuid.coresPerSocket = "$cores_per_socket"
-		maxvcpus = "$real_core_count"
-		memsize = "$mem"
-		MemAllowAutoScaleDown = "FALSE"
-		MemTrimRate = "-1"
-
-		# ide-disks
-		ide0:0.present = "$ide"
-		ide0:0.fileName = "$vm_diskfile"
-		## Edited for persistent mode.
-		ide0:0.mode = "independent-${diskmode}"
-		##
-		ide1:0.present = "$cdrom0"
-		ide1:0.autodetect = "TRUE"
-		ide1:0.fileName = "auto detect"
-		ide1:0.deviceType = "cdrom-raw"
-		ide1:1.present = "$cdrom1"
-		ide1:1.autodetect = "TRUE"
-		ide1:1.fileName = "auto detect"
-		ide1:1.deviceType = "cdrom-raw"
-
-		# scsi-disks
-		scsi0.present = "$scsi"
-		scsi0:0.present = "$scsi"
-		scsi0:0.fileName = "$vm_diskfile"
-		scsi0.virtualDev = "$hddrv"
-		## Edited for persistent mode.
-		scsi0:0.mode = "independent-${diskmode}"$stateFileConfiguration
-		##
-
-		# floppies
-		floppy0.present = "$floppy0"
-		floppy0.startConnected = "TRUE"
-		floppy0.autodetect = "TRUE"
-		floppy0.fileName = "auto detect"
-
-		# we need floppy b: for the client configuration
-		floppy1.present = "$floppy1"
-		floppy1.readonly = "TRUE"
-		floppy1.startConnected = "TRUE"
-		floppy1.fileType = "file"
-		floppy1.fileName = "$FLOPPYIMG"
-
-		# nics
-		ethernet0.present = "TRUE"
-		ethernet0.addressType = "static"
-		$network_virtualDev
-		#ethernet0.connectionType = "hostonly"
-		ethernet0.connectionType = "custom"
-		ethernet0.vnet = "$hostdev"
-		ethernet0.address = "00:50:56:$macaddrsuffix"
-		ethernet0.wakeOnPcktRcv = "FALSE"
-
-		# sound
-		sound.present = "TRUE"
-		$sound_fileName
-		sound.virtualdev = "$sound"
-		pciSound.enableVolumeControl = "FALSE"
-		sound.enableVolumeControl = "FALSE"
-
-		# svga
-		svga.autodetect = "TRUE"
-
-		# usb
-		usb.present = "TRUE"
-		usb.generic.autoconnect = "TRUE"
-
-		# pci configuration
-		usb.pciSlotNumber = "16"
-		ethernet0.pciSlotNumber = "17"
-		sound.pciSlotNumber = "18"
-		ehci.pciSlotNumber = "19"
-		scsi0.pciSlotNumber = "20"
-
-		$PCIE
-
-		# shared folders
-		$enable_share
-		sharedFolder0.present = "$shfolders"
-		sharedFolder0.enabled = "$shfolders"
-		sharedFolder0.expiration = "never"
-		sharedFolder0.guestName = "$homesharename"
-		sharedFolder0.hostPath = "$homesharepath"
-		sharedFolder0.readAccess = "TRUE"
-		sharedFolder0.writeAccess = "TRUE"
-		sharedFolder1.present = "$shfolders"
-		sharedFolder1.enabled = "$shfolders"
-		sharedFolder1.expiration = "never"
-		sharedFolder1.guestName = "$commonsharename"
-		sharedFolder1.hostPath = "$commonsharepath"
-		sharedFolder1.readAccess = "TRUE"
-		sharedFolder1.writeAccess = "TRUE"
-		sharedFolder.maxNum = "2"
-
-		# dirs/configs
-		tmpDirectory = "$redodir"
-		redoLogDir = "$redodir"
-		mainMem.useNamedFile = "TRUE"
-		snapshot.disabled = "TRUE"
-		tools.syncTime = "TRUE"
-		isolation.tools.hgfs.disable = "$HGFS_DISABLED"
-		hgfs.mapRootShare = "TRUE"
-		isolation.tools.dnd.disable = "FALSE"
-		isolation.tools.copy.enable = "TRUE"
-		isolation.tools.paste.enabled = "TRUE"
-
-		# serial port
-		serial0.present = "$serial"
-		$serialdev
-
-		# parallel port
-		parallel0.present = "$parallel"
-		parallel0.bidirectional = "$paralbidi"
-		$paraldev
-	HEREEND
-
-	# set the appropriate permissions for the vmware config file
-	chmod u+rwx "${conffile}" >/dev/null 2>&1
-}
diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/log_config_summary.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/log_config_summary.inc
new file mode 100644
index 00000000..f7f09c65
--- /dev/null
+++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/log_config_summary.inc
@@ -0,0 +1,62 @@
+##################################################
+# Include: Print vm config summary into log file #
+##################################################
+
+# log script information
+writelog "# File created by $0 (VMware version ${vmware_version})\n# on $(date)\n"
+## Edited for persistent mode.
+writelog "Starting with ${diskmode} mode ...\n"
+##
+
+# write all results to logfile
+# log disksetup
+writelog "Directories:"
+writelog "\tConfdir:\t${confdir}"
+writelog "\tConffile:\t${conffile}"
+writelog "\tRedodir:\t${redodir}"
+writelog "\tVMhome:\t\t${vmhome}"
+writelog "\t/tmp info: $(grep "/tmp " /proc/mounts) $(df -h | grep " /tmp$" | awk '{print $2}')"
+# hw setup
+writelog "Hardware:"
+writelog "\tMAC:\t\t$macaddr"
+if [ -n "${network_card}" ]; then
+	writelog "\tNet Adaptor:\t${network_card}"
+fi
+writelog "\tMem:\t\t${mem} MB"
+
+# echo nur wenn hostmem gesetzt
+[ -n "${hostmem}" ] && writelog "\tHostmem:\t${hostmem} MB"
+writelog "\tMax. res.:\t${xres}x${yres}"
+writelog "\tCD-ROM1:\t${cdrom0}"
+writelog "\tCD-ROM2:\t${cdrom1}"
+writelog "\tFloppy_A:\t${floppy0}"
+if [ "${serial}" = "TRUE" ]; then
+	writelog "\tSerial Port:\t${serialdev}"
+fi
+if [ "${parallel}" = "TRUE" ]; then
+	writelog "\tParallel Port:\t${paraldev}"
+fi
+
+writelog "Shared folders:"
+if [ "${HGFS_DISABLED}" = "FALSE" ]; then
+	writelog "\tNo shared folders enabled."
+else
+	writelog "\Shared folders enabled."
+fi
+
+# image
+writelog "Diskimage:"
+writelog "\tDiskfile:\t${diskfile}"
+writelog "\tDisktype:\t${hddrv}"
+writelog "\tHWVersion:\t${hwver}"
+writelog "\tVMostype:\t${vmostype}"
+
+# misc
+writelog "Misc:"
+writelog "\tDisplayname:\t${displayname}"
+if [ "${cap3d}" = "TRUE" -a "${enable3d}" = "TRUE" ]; then
+	writelog "\t3D Graphics:\tenabled"
+fi
+# empty line at end
+writelog ""
+
diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/logging.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/logging.inc
deleted file mode 100644
index f7ee634a..00000000
--- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/logging.inc
+++ /dev/null
@@ -1,64 +0,0 @@
-###############################
-# Include: Logging and stdout #
-###############################
-
-logging() {
-	# log script information
-	writelog "# File created by $0 (VMware version ${vmware_version})\n# on $(date)\n"
-	## Edited for persistent mode.
-	writelog "Starting with ${diskmode} mode ...\n"
-	##
-	
-	# write all results to logfile
-	# log disksetup
-	writelog "Directories:"
-	writelog "\tConfdir:\t${confdir}"
-	writelog "\tConffile:\t${conffile}"
-	writelog "\tRedodir:\t${redodir}"
-	writelog "\tVMhome:\t\t${vmhome}"
-	writelog "\t/tmp info: $(grep "/tmp " /proc/mounts) $(df -h | grep " /tmp$" | awk '{print $2}')"
-	# hw setup
-	writelog "Hardware:"
-	writelog "\tMAC:\t\t$macaddr"
-	if [ -n "${network_card}" ]; then
-		writelog "\tNet Adaptor:\t${network_card}"
-	fi
-	writelog "\tMem:\t\t${mem} MB"
-
-	# echo nur wenn hostmem gesetzt
-	[ -n "${hostmem}" ] && writelog "\tHostmem:\t${hostmem} MB"
-	writelog "\tMax. res.:\t${xres}x${yres}"
-	writelog "\tCD-ROM1:\t${cdrom0}"
-	writelog "\tCD-ROM2:\t${cdrom1}"
-	writelog "\tFloppy_A:\t${floppy0}"
-	if [ "${serial}" = "TRUE" ]; then
-		writelog "\tSerial Port:\t${serialdev}"
-	fi
-	if [ "${parallel}" = "TRUE" ]; then
-		writelog "\tParallel Port:\t${paraldev}"
-	fi
-
-	writelog "Shared folders:"
-	if [ "${HGFS_DISABLED}" = "FALSE" ]; then
-		writelog "\tNo shared folders enabled."
-	else
-		writelog "\Shared folders enabled."
-	fi
-
-	# image
-	writelog "Diskimage:"
-	writelog "\tDiskfile:\t${diskfile}"
-	writelog "\tDisktype:\t${hddrv}"
-	writelog "\tHWVersion:\t${hwver}"
-	writelog "\tVMostype:\t${vmostype}"
-
-	# misc
-	writelog "Misc:"
-	writelog "\tDisplayname:\t${displayname}"
-	if [ "${cap3d}" = "TRUE" -a "${enable3d}" = "TRUE" ]; then
-		writelog "\t3D Graphics:\tenabled"
-	fi
-	# empty line at end
-	writelog ""
-
-}
diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/set_hardware_legacy.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/set_hardware_legacy.inc
deleted file mode 100644
index 22718839..00000000
--- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/set_hardware_legacy.inc
+++ /dev/null
@@ -1,152 +0,0 @@
-#########################################
-# Include: Hardware checks and settings #
-#########################################
-
-set_hardware_legacy() {
-
-# use different network card (default e1000, vlance, vmxnet)
-if [ -n "${network_card}" ]; then
-	network_virtualDev="ethernet0.virtualDev = \"${network_card}\""
-else
-	network_virtualDev='ethernet0.virtualDev = "e1000"'
-fi
-
-# use different network card (default e1000, vlance, vmxnet)
-hostdev="/dev/vmnet1"
-case "${network_kind}" in
-	bridge|bridged)
-		hostdev="/dev/vmnet0"
-	;;
-	nat)
-	        hostdev="/dev/vmnet1"
-	;;
-	hostonly|host-only)
-        	hostdev="/dev/vmnet2"
-	;;
-esac
-
-# set standard sound card, overwrite depending on OS (options sb16, es1371, hdaudio)
-sound="es1371"
-
-# set sound card explicitly if there is more than one card in the host system
-sound_fileName='sound.fileName = "-1"
-sound.autodetect = "TRUE"'
-
-# check for 3D configuration setting
-case "$enable3d" in
-	true|yes)
-		enable3d="TRUE"
-	;;
-	*)
-		enable3d="FALSE"
-	;;
-esac
-
-# check for whitelisted HW-3D
-FORCE3D=""
-if [ -n "$SLX_VMWARE_3D" ]; then
-	FORCE3D='mks.gl.allowBlacklistedDrivers = "TRUE"'
-fi
-
-# serial/parallel port defined (e.g. "ttyS0, lp0" or "autodetect")
-case "$serial" in
-	tty*)
-		if [ -e "/dev/$serial" ]; then
-			serialdev="serial0.filename = \"/dev/${serial}\""
-			serial="TRUE"
-		else
-			serialdev="# no serial port configured"
-			serial="FALSE"
-		fi
-	;;
-	auto*)
-		serialdev="serial0.autodetect = \"TRUE\""
-		serial="TRUE"
-	;;
-	*)
-		serialdev="# no serial port configured"
-		serial="FALSE"
-	;;
-esac
-
-case "$parallel" in
-	lp*|parport*)
-		if [ -e "/dev/$parallel" ]; then
-			paraldev="parallel0.filename = \"/dev/${parallel}\""
-			paralbidi="TRUE"
-			parallel="TRUE"
-		else
-			paraldev="# no parallel port configured"
-			paralbidi="FALSE"
-			parallel="FALSE"
-		fi
-	;;
-	auto*)
-		paraldev="parallel0.autodetect = \"TRUE\""
-		paralbidi="TRUE"
-		parallel="TRUE"
-	;;
-	*)
-		paraldev="# no parallel port configured"
-		paralbidi="FALSE"
-		parallel="FALSE"
-	;;
-esac
-
-# check if ide/scsi and hwver of image
-# read only the first 30 lines to be sure
-imghead=$(head -n 30 "${diskfile}")
-
-## Added to handle persistent snapshots.
-if [[ "$originalVMDKFilePath" ]]; then
-	echo "Select \"${originalVMDKFilePath}\" as information base for \"${diskfile}\"."
-	imghead=$(head -n 30 "$originalVMDKFilePath") && \
-
-	# Support suspend mode.
-	stateFilePath="$(readlink -f "$(dirname "$diskfile")/"*.vmss)" && \
-	if [ -f "$stateFilePath" ]; then
-		echo "Found  state file \"$stateFilePath\"." && \
-		stateFileConfiguration="
-		checkpoint.vmState = \"$stateFilePath\""
-	fi
-	POSTRUN="stateFilePath=\"\$(readlink -f \"${confdir}/\"*.vmss)\" && memoryFilePath=\"\$(readlink -f \"${confdir}/\"*.vmem)\" && [ -f \"\$stateFilePath\" ] && echo \"Saving state and memory file \\\"\$stateFilePath\\\" and \\\"\$memoryFilePath\\\".\" && mv -f \"\$stateFilePath\" \"$(dirname "$diskfile")/\" && mv -f \"\$memoryFilePath\" \"$(dirname "$diskfile")/\""
-fi
-
-##
-hwver=$(echo "${imghead}" | grep -m1 -ia "ddb.virtualHWVersion" | awk -F '"' '{print $2}')
-
-
-if [ -z "$override_hddtype" ]; then
-        hddrv=$(echo "${imghead}" | grep -m1 -ia "ddb.adapterType" | awk -F '"' '{print $2}')
-else
-        hddrv=$override_hddtype
-fi
-
-PCIE=
-case "${hddrv}" in
-	ide)
-		ide="TRUE"
-		scsi="FALSE"
-	;;
-	lsisas*)
-		ide="FALSE"
-		scsi="TRUE"
-		PCIE='pciBridge4.present = "TRUE"
-		pciBridge4.virtualDev = "pcieRootPort"
-		pciBridge4.functions = "8"'
-	;;
-	lsilogic|buslogic)
-		ide="FALSE"
-		scsi="TRUE"
-	;;
-	scsi)
-		ide="FALSE"
-		scsi="TRUE"
-		hddrv="lsilogic"
-	;;
-	*)
-		slxlog "virt-vmware-hdd" "vmware: Unknown HDD adapter type $hddrv"
-	;;
-esac
-
-}
diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/write_config_files_legacy.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/write_config_files_legacy.inc
deleted file mode 100644
index 52a341ba..00000000
--- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/write_config_files_legacy.inc
+++ /dev/null
@@ -1,29 +0,0 @@
-###############################
-# Include: Write config files #
-###############################
-
-write_config_files_legacy() {
-	# create vmware directories
-	mkdir -p "$redodir" >/dev/null 2>&1
-	mkdir -p "$confdir" >/dev/null 2>&1
-	mkdir -p "$vmhome/dndlogs" >/dev/null 2>&1
-	touch "$vmhome/dndlogs/dndlog.conf" >/dev/null 2>&1
-	
-	# create preferences file ${vmhome}/preferences
-	source "${VMWAREINCLUDEDIR}/create_vmhome_preferences_file.inc" && create_vmhome_preferences_file
-	
-	# create VMware config file (conffile)
-	source "${VMWAREINCLUDEDIR}/create_vmware_config_file_legacy.inc" && create_vmware_config_file_legacy
-
-	# link to conffile if confdir != redodir
-	[ "$confdir" != "$redodir" ] && ln -s "$conffile" "$redodir/run-vmware.conf" >/dev/null 2>&1
-	
-	# sync is needed to ensure that data is really written to virtual disk
-	# TODO: Move to general run-virt, right before exec of vm
-	sync
-	
-	# own nvram. We need it for floppy drive b, default nvram has just drive a
-	if ! cp "/opt/openslx/vmchooser/vmware/nvram" "$confdir/nvram"; then
-		slxlog "virt-vmware-nvram" "Could not copy nvram from '/opt/openslx/vmchooser/vmware/nvram' '$confdir/nvram'"
-	fi
-}
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 08188b58..84679ebf 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
@@ -33,34 +33,23 @@ vmw_cap_hw_version() {
 	[ "$1" -lt "$maxhardwareversion" ] && maxhardwareversion="$1"
 }
 
-if [ "$LEGACY" ]; then
-	# hardware checks
-	source "${VMWAREINCLUDEDIR}/set_hardware_legacy.inc" && set_hardware_legacy
-	# write configuration files
-	# write_config_files calls:
-	#	set_vmhome_preferences_header
-	#	set_vmware_startup_file
-	source "${VMWAREINCLUDEDIR}/write_config_files_legacy.inc" && write_config_files_legacy
-else
-	# get information from downloaded vmx
-	source "${VMWAREINCLUDEDIR}/parse_vmx.inc"
+# get information from downloaded vmx
+source "${VMWAREINCLUDEDIR}/parse_vmx.inc"
 
-	# determine limitations wrt RAM and CPU count of VM
-	source "${VMWAREINCLUDEDIR}/determine_hardware_limitations.inc"
+# determine limitations wrt RAM and CPU count of VM
+source "${VMWAREINCLUDEDIR}/determine_hardware_limitations.inc"
 
-	# create file and directory structure for vmware setup
-	source "${VMWAREINCLUDEDIR}/create_static_directory_structure.inc"
+# create file and directory structure for vmware setup
+source "${VMWAREINCLUDEDIR}/create_static_directory_structure.inc"
 
-	# create preferences file ${vmhome}/preferences
-	source "${VMWAREINCLUDEDIR}/create_vmhome_preferences_file.inc" && create_vmhome_preferences_file
+# create preferences file ${vmhome}/preferences
+source "${VMWAREINCLUDEDIR}/create_vmhome_preferences_file.inc" && create_vmhome_preferences_file
 
-	# parse the given vmx file
-	source "${VMWAREINCLUDEDIR}/write_final_vmx.inc"
-fi
+# parse the given vmx file
+source "${VMWAREINCLUDEDIR}/write_final_vmx.inc"
 
-# logging and stdout
-# needs writelog() from vmchooser-run_virt
-source "${VMWAREINCLUDEDIR}/logging.inc" && logging
+# print summary - needs writelog() from vmchooser-run_virt
+source "${VMWAREINCLUDEDIR}/log_config_summary.inc"
 
 # For debugging
 cp "$conffile" "/tmp/vmware-last-config"
-- 
cgit v1.2.3-55-g7522


From daa8b9fd8255d9033637c304241deba8d7f3bd58 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 21 Oct 2016 17:27:16 +0200
Subject: [run-virt/...] More cleanup, refactoring, comments

---
 .../opt/openslx/vmchooser/qemukvm/run-virt.include |  12 +-
 .../check_runvirt_needed_files.inc                 |  53 ---
 .../vmchooser/run-virt-includes/detect_legacy.inc  |  34 --
 .../run-virt-includes/download_vm_metadata.inc     |  34 ++
 .../run-virt-includes/get_xml_file_variables.inc   | 131 +++----
 .../set_runvirt_hardware_variables.inc             |  21 +-
 .../run-virt-includes/set_runvirt_variables.inc    |   2 +-
 .../run-virt-includes/setup_image_access.inc       |  81 +++--
 .../run-virt-includes/setup_vm_hypervisor.inc      |  26 +-
 .../vmchooser_runvirt_functions.inc                |  19 +
 .../data/opt/openslx/vmchooser/vmchooser-run_virt  |  41 ++-
 .../openslx/vmchooser/virtualbox/machine.include   |   6 +-
 .../openslx/vmchooser/virtualbox/run-virt.include  | 400 ++++++---------------
 .../vmchooser/virtualbox/virtualbox.include        |   4 +-
 .../includes/determine_hardware_limitations.inc    |  56 +--
 .../vmware/includes/log_config_summary.inc         |   9 +-
 .../includes/set_vmware_include_variables.inc      |   5 -
 .../vmchooser/vmware/includes/write_final_vmx.inc  |   2 +-
 .../opt/openslx/vmchooser/vmware/run-virt.include  |   2 +-
 19 files changed, 359 insertions(+), 579 deletions(-)
 delete mode 100644 remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/check_runvirt_needed_files.inc
 delete mode 100644 remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/detect_legacy.inc
 create mode 100644 remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/download_vm_metadata.inc

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

diff --git a/remote/modules/qemukvm/data/opt/openslx/vmchooser/qemukvm/run-virt.include b/remote/modules/qemukvm/data/opt/openslx/vmchooser/qemukvm/run-virt.include
index 29360159..81bf9218 100644
--- a/remote/modules/qemukvm/data/opt/openslx/vmchooser/qemukvm/run-virt.include
+++ b/remote/modules/qemukvm/data/opt/openslx/vmchooser/qemukvm/run-virt.include
@@ -44,16 +44,16 @@ mkdir -m 1777 -p ${QKTMPDIR} 2>/dev/null
 diskfile=${vmpath}
 
 # check the file type
-if echo ${imgname} | grep -iE "img|qcow|vmdk" >/dev/null 2>&1; then
-  imgtype=$(echo ${imgname##*.} | tr "[a-z]" "[A-Z]")
+if echo ${IMG_BASENAME} | grep -iE "img|qcow|vmdk" >/dev/null 2>&1; then
+  imgtype=$(echo ${IMG_BASENAME##*.} | tr "[a-z]" "[A-Z]")
 else
-  writelog "${imgname} is not a valid image type (img|qcow*|vmdk), exiting!"
+  writelog "${IMG_BASENAME} is not a valid image type (img|qcow*|vmdk), exiting!"
   exit 1
 fi
 
 # set the emulator/virtualization options for various operating systems
 sound="es1370"
-case "${vmostype}" in
+case "${VM_OS_TYPE}" in
   beos*)
     VIRTCMDOPTS="qemu-system-i386 -machine accel=tcg"
     sound="sb16"
@@ -91,8 +91,8 @@ esac
 #VIRTCMDOPTS="${VIRTCMDOPTS} -alt-grab"
 
 # display name, remove blanks because of cmdline problems
-displayname=$(echo ${displayname} | sed -e "s, ,-,g;s,(,[,g;s,),],g")
-VIRTCMDOPTS="${VIRTCMDOPTS} -name ${displayname}"
+VM_DISPLAYNAME=$(echo ${VM_DISPLAYNAME} | sed -e "s, ,-,g;s,(,[,g;s,),],g")
+VIRTCMDOPTS="${VIRTCMDOPTS} -name ${VM_DISPLAYNAME}"
 
 writelog "Directories:"
 writelog "\tTMPDIR:\t\t\t$QKTMPDIR"
diff --git a/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/check_runvirt_needed_files.inc b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/check_runvirt_needed_files.inc
deleted file mode 100644
index fbb0bc70..00000000
--- a/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/check_runvirt_needed_files.inc
+++ /dev/null
@@ -1,53 +0,0 @@
-#################################################################
-# Include: Check for important files used by vmchooser_run-virt #
-#################################################################
-
-# WARNING: This is perhaps vestigial!
-
-filecheck() {
-        filecheck=$(LANG=us ls -lh ${diskfile} 2>&1)
-        writelog "Filecheck:\n${filecheck}\n"
-        noimage=$(echo ${filecheck} | grep -i "no such file or directory" | wc -l)
-        rightsfile=${diskfile}
-
-        # check if link
-        if [ -L "${diskfile}" ]; then
-                # take link target
-                rightsfile=$(ls -lh ${diskfile} 2>&1 | awk -F '-> *' '{print $2}')
-                rightsfile=${vmdir}/${rightsfile}
-                filecheck=$(LANG=us ls -lh ${rightsfile} 2>&1)
-        fi
-
-        # does file exist
-        if [ "${noimage}" -ge "1" ]; then
-                writelog "Virtual Machine Image Problem:\c "
-                writelog "\tThe image you've specified doesn't exist."
-                writelog "Filecheck says:\c "
-                writelog "\t\t${diskfile}:\n\t\t\tNo such file or directory"
-                writelog "Hint:\c "
-                writelog "\t\t\tCompare spelling of the image with your options.\n"
-                exit 1
-        fi
-        # readable by calling user
-        if ! [ -r "${diskfile}" >/dev/null 2>&1 \
-                -o -r "${diskfile}" >/dev/null 2>&1 ]; then
-                writelog "Vmware Image Problem:\c "
-                writelog "\tThe image you've specified has wrong rights."
-                writelog "Filecheck says:\t\t$(echo ${filecheck} \
-                | awk '{print $1" "$3" "$4}') ${rightsfile}"
-                writelog "Hint:\t\t\tChange rights with: chmod a+r ${rightsfile}\n"
-                exit 1
-        fi
-
-        # writable (for persistent-mode)?
-        if ! [ -w "${diskfile}" >/dev/null 2>&1 \
-        -o -w "${diskfile}" >/dev/null 2>&1 ] \
-        && [ "${np}" = "independent-persistent" ]; then
-                writelog "Vmware Image Problem:\c "
-                writelog "\tThe image you have specified has wrong rights."
-                writelog "Filecheck says:\t\t$(echo ${filecheck} \
-                | awk '{print $1" "$3" "$4}') ${rightsfile}"
-                writelog "Hint:\t\t\tUse nonpersistent-mode or change rights to rw\n"
-                exit 1
-        fi
-}
diff --git a/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/detect_legacy.inc b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/detect_legacy.inc
deleted file mode 100644
index 8bdfd8b1..00000000
--- a/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/detect_legacy.inc
+++ /dev/null
@@ -1,34 +0,0 @@
-########################################################
-# Include: Detect, whether runvirt runs in legacy mode #
-########################################################
-
-# Legacy mode: As runvirt has been before.
-# New mode: uuid in xml _and_ vmx given via http.
-
-writelog "Detecting current/legacy mode ..."
-
-# First, let's try to extract an imguuid from xmlfile:
-declare -rg IMGUUID=$(grep -i -o '<uuid param=.*"' "${xmlfile}" | sed -e "s/&.*;/; /g" | awk -F '"' '{ print $2 }')
-declare -rg TMPCONFIG="$TMPDIR/vmconfig.tmp"
-
-writelog "IMGUUID extracted: $IMGUUID"
-
-# Assume legacy mode by default, only trigger "current" mode if everything else below worked
-LEGACY=yes
-if [ -z "$IMGUUID" ]; then	# Keine uuid: Abbruch, Legacy
-	writelog "Could not extract a uuid param from ${xmlfile}. Triggering legacy mode."
-else
-	# Now getting template file:
-	if ! wget -T 6 -O "$TMPCONFIG" "${SLX_VMCHOOSER_BASE_URL}/lecture/${IMGUUID}" 2>/dev/null >&2; then
-		writelog "wget ${SLX_VMCHOOSER_BASE_URL}/lecture/${IMGUUID}. Triggering legacy mode."
-	else
-		writelog "wget ${SLX_VMCHOOSER_BASE_URL}/lecture/${IMGUUID} successful."
-		if [ ! -s "$TMPCONFIG" ]; then
-			writelog "Server sent zero byte virtual machine description file. Triggering legacy mode."
-		else
-			writelog "Triggering current (non-legacy) mode."
-			LEGACY=		# everything worked - clear legacy mode variable (so we use the "current" mode)
-		fi
-	fi
-fi
-
diff --git a/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/download_vm_metadata.inc b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/download_vm_metadata.inc
new file mode 100644
index 00000000..b1995d09
--- /dev/null
+++ b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/download_vm_metadata.inc
@@ -0,0 +1,34 @@
+########################################################
+# Include: Detect, whether runvirt runs in legacy mode #
+########################################################
+
+# Legacy mode: As runvirt has been before.
+# New mode: uuid in xml _and_ vmx given via http.
+
+writelog "Detecting current/legacy mode ..."
+
+declare -rg TMPCONFIG="$TMPDIR/vmconfig.tmp"
+
+writelog "IMGUUID extracted: $IMGUUID"
+
+# Assume legacy mode by default, only trigger "current" mode if everything else below worked
+LEGACY=yes
+if [ -z "$IMGUUID" ]; then	# Keine uuid: Abbruch, Legacy
+	writelog "Could not extract a uuid param from ${xmlfile}. Triggering legacy mode."
+else
+	# Now getting template file:
+	if ! wget -T 6 -O "$TMPCONFIG" "${SLX_VMCHOOSER_BASE_URL}/lecture/${IMGUUID}" 2>/dev/null >&2; then
+		writelog "wget ${SLX_VMCHOOSER_BASE_URL}/lecture/${IMGUUID}. Triggering legacy mode."
+	else
+		writelog "wget ${SLX_VMCHOOSER_BASE_URL}/lecture/${IMGUUID} successful."
+		if [ ! -s "$TMPCONFIG" ]; then
+			writelog "Server sent zero byte virtual machine description file. Triggering legacy mode."
+		else
+			writelog "Triggering current (non-legacy) mode."
+			LEGACY=		# everything worked - clear legacy mode variable (so we use the "current" mode)
+		fi
+	fi
+fi
+
+readonly LEGACY
+
diff --git a/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/get_xml_file_variables.inc b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/get_xml_file_variables.inc
index b7ed648c..eb699ec0 100644
--- a/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/get_xml_file_variables.inc
+++ b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/get_xml_file_variables.inc
@@ -1,103 +1,62 @@
-###########################################
-# Include: Set hardware related variables #
-###########################################
+############################################
+# Include: Get needed values from XML file #
+############################################
 
-writelog "Starting configuration..."
-writelog "\tLogfile:\t\t${LOGFILE}"
-writelog "\t/tmp info:\t\t$(df -h | grep " /tmp$" | awk '{print $2}') \c"
-writelog "$(grep "/tmp " /proc/mounts | awk '{print $1" "$2" "$3" "$4}')"
-writelog "\tVM XML dir:\t\t$(dirname "${xmlfile}")"
-writelog "\tXML file:\t\t${xmlfile}"
-writelog "Enable 3D:\t\t${enable3d}"
-writelog "VM config:"
+writelog "Parsing XML..."
+
+declare -rg VMSTORE_PATH=/mnt/vmstore
+
+# Need some lean and mean xml parser some day in the far future
+get_xml () {
+	grep -Pio "<$1"'\s+param=[^"]*".*' "${xmlfile}" \
+		| awk -F '"' '{ print $2 }' \
+		| sed 's/&amp;/+/g;s/&quot;/"/g;s/&lt;/</g;s/&gt;/>/g'
+}
 
 # # Name of the virt image
-imgname=$(grep -io '<image_path param=.*"' "${xmlfile}" | sed -e "s/&.*;/; /g" | awk -F '"' '{ print $2 }')
-imgrelpath=$(grep -io '<image_name param=.*"' "${xmlfile}" | sed -e "s/&.*;/; /g" | awk -F '"' '{ print $2 }')
-# [ -z "$imgname" ] && imgname="${imgrelpath}"
-imgrelpath=${imgrelpath#/mnt/vmstore/}
+SRC_IMG_ABSOLUTE=$(get_xml "image_path")
+SRC_IMG_RELATIVE=$(get_xml "image_name")
 
-writelog "Virtual image file name: $imgname"
+if [ -z "${SRC_IMG_ABSOLUTE}${SRC_IMG_RELATIVE}" ]; then
+	writelog "Neither relative nor absolute path for image found in xml"
+	cleanexit 1
+fi
 
-# Imagename w/ full path
-if echo "${imgname}" | grep -q '^/'; then
-	imgpath="$(dirname "${imgname}")"
-	imgname="$(basename "${imgname}")"
-	vmpath="${imgpath}/${imgname}"
-	# If old vmchooser binary stuff
-	# We do not need folder name as it is already included by vmchooser
-elif echo "${xmlfile}" | grep -q '^/tmp/'; then
-	vmpath="$imgname"
-	imgname="$(basename "${imgname}")"
-	## Added for persistent support.
-else
-	# Else use same path as xml
-	imgpath="${xmlpath}"
-	vmpath="${imgpath}/${imgname}"
+if [ -n "$SRC_IMG_ABSOLUTE" ] && [ "${SRC_IMG_ABSOLUTE:0:1}" != "/" ]; then
+	writelog "Error parsing XML for absolute image path: given value doesn't start with '/': '$SRC_IMG_ABSOLUTE'"
+	cleanexit 1
 fi
 
-# If ${vm_name} not defined use ${xmlfile}
-vm_name="${vm_name:-${xmlfile%.xml}}"
+if [ -z "$SRC_IMG_ABSOLUTE" ]; then
+	SRC_IMG_ABSOLUTE="${VMSTORE_PATH}/${SRC_IMG_RELATIVE}"
+fi
 
-# Define vm_shortname since vm_name can be very long
-vm_shortname="$(basename "${xmlfile%.xml}" | sed -e "s, ,-,g")"
+IMG_BASENAME=$(basename "$SRC_IMG_ABSOLUTE")
+writelog "Virtual image file name: $IMG_BASENAME"
 
-# vm_name = displayname, define for old scripts
-displayname="${vm_name}"
+VM_DISPLAYNAME=$(get_xml "short_description")
+[ -z "$VM_DISPLAYNAME" ] && VM_DISPLAYNAME="${IMG_BASENAME}"
+
+# Define VM_NAME_CLEAN since VM_DISPLAYNAME can be long and contain weird characters
+VM_NAME_CLEAN=$(echo "${VM_DISPLAYNAME:0:32}" | sed -r 's/[^0-9a-zA-Z_-\.]+/_/g')
 
 # image is for the following virtual machine
-xmlvirt=$(grep -o 'virtualmachine param=.*"' "${xmlfile}" \
+PLUGIN_ID=$(grep -o 'virtualmachine param=.*"' "${xmlfile}" \
 	| sed -e "s/&.*;/; /g" | awk -F '"' '{print $2}')
 
-# choose the proper virtualization/emulator plugin
-[ "x${xmlvirt}" != "x" -a "x${xmlvirt}" != "xqemukvm" -a "x${xmlvirt}" != "xvirtualbox" -a "x${xmlvirt}" != "xvmware" ] && xmlvirt="emufe"
-
-# Extracting OS type (vmostype) from xml file. We don't care here whether vmostype is empty, as then 
+# Extracting OS type (VM_OS_TYPE) from xml file. We don't care here whether VM_OS_TYPE is empty, as then 
 # it will yield the default entries later on.
-vmostype=$(grep -io '<os param=.*"' "${xmlfile}" | sed -e "s/&.*;/; /g" | awk -F '"' '{ print $2 }')
+VM_OS_TYPE=$(get_xml "os")
 
-# make a guess from the filename extension if ${xmlvirt} is empty
-# (not set within the XML file)
-# TODO: implement possibility to submit own configuration files
-if [ -z "${xmlvirt}" ] && [ -n "${additional_config}" ]; then
-	writelog "No virtual machine parameter defined in ${xmlfile}"
-	writelog "Trying to guess VM...\c"
-	case "$(cat ${additional_config} | tr \"[A-Z]\" \"[a-z]\")" in
-		*config.version*|*virtualhw.version*|*independent-nonpersistent*|*vmdk*)
-			xmlvirt="vmware"
-		;;
-		*innotek*|*virtualbox*)
-			xmlvirt="virtualbox"
-		;;
-		*qemu*|*kvm*)
-			xmlvirt="qemukvm"
-		;;
-		*)
-			xmlvirt="none"
-		;;
-	esac
-	elif [ -z "${xmlvirt}" ]; then
-	case "$(echo ${imgname##*.} | tr \"[A-Z]\" \"[a-z]\")" in
-		vmdk)
-			xmlvirt="vmware"
-		;;
-		vbox|vdi)
-			xmlvirt="virtualbox"
-		;;
-		qcow*)
-			xmlvirt="qemukvm"
-		;;
-		*)
-			xmlvirt="emufe"
-		;;
-	esac
-	writelog "result:\t${xmlvirt}"
-fi
+readonly SRC_IMG_ABSOLUTE SRC_IMG_RELATIVE
+readonly IMG_BASENAME
+readonly VM_DISPLAYNAME VM_NAME_CLEAN
+readonly PLUGIN_ID
+readonly VM_OS_TYPE
 
-# Set redirects to 0, see vmgrid if you want to define some
-redirects=0
+writelog "Virtualization plugin:  $PLUGIN_ID"
+writelog "VM name:                $VM_DISPLAYNAME"
+writelog "VM short name:          $VM_NAME_CLEAN"
+writelog "VM OS:                  $VM_OS_TYPE"
+writelog "Done parsing XML."
 
-writelog "\tVirtualization:\t\t$xmlvirt"
-writelog "\tVM name:\t\t$vm_name"
-writelog "\tVM short name:\t\t$vm_shortname"
-writelog "\tVM OS:\t\t$vmostype" 
diff --git a/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/set_runvirt_hardware_variables.inc b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/set_runvirt_hardware_variables.inc
index 9a46bc88..7ef03c1c 100644
--- a/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/set_runvirt_hardware_variables.inc
+++ b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/set_runvirt_hardware_variables.inc
@@ -19,6 +19,7 @@ get_vm_id() {
 	fi
 	# fallback: take last two digits of current pid...
 	VM_ID=$(expr substr $$ $(expr ${#$} - 1) 2)
+	[ "${#VM_ID}" -eq 1 ] && VM_ID="0${VM_ID}"
 }
 
 get_vm_id
@@ -38,18 +39,18 @@ else
 fi
 
 # Calculate absulute amount of RAM that should stay available to the host
-reserve="$[ ( $totalmem * $reserve ) / 100 ]"
+reserve="$(( ( totalmem * reserve ) / 100 ))"
 # Respect some upper and lower bounds for the host amount
 [ "$reserve" -lt "$min" ] && reserve="$min"
 [ "$reserve" -gt "$max" ] && reserve="$max"
 
 # Get a result which can be divided by 4
-mem="$[ ( ( $totalmem - $reserve ) / 4 ) * 4 ]"
+mem="$(( ( ( totalmem - reserve ) / 4 ) * 4 ))"
 if [ -n "$mainvirtmem" ]; then
-	forcemem="$[ "$mainvirtmem" / 4 * 4 ]"
+	forcemem="$(( mainvirtmem / 4 * 4 ))"
 	mem="$forcemem"
 fi
-hostmem="$[ $totalmem - $mem ]"
+hostmem="$(( totalmem - mem ))"
 
 # Fill in VMID
 macaddrsuffix=$(echo "$macaddrsuffix" | sed "s/%VMID%/${VM_ID}/")
@@ -75,17 +76,9 @@ cdrom0=${cdtest:-"FALSE"}
 cdtest=${cdrom_1:+"TRUE"}
 # if $cdtest not set cdrom1="FALSE", else "TRUE"
 cdrom1=${cdtest:-"FALSE"}
-# IDE is expected default, test for the virtual disk image type should
-# be done while creating the runscripts ...
-# TODO enable SCSI support instead of just disabling it.
-ide="TRUE"
-scsi="FALSE"
-hddrv="ide"
-audio="true"
-remotedesktopport="590${VM_ID}"
 
-# Enable 3D
-enable3d=$(grep -i -o "<enable3d param=.*" "${xmlfile}" | awk -F '"' '{print $2}' | rv_clean_string)
+# RDP/VNC port (59001 - 59099)
+remotedesktopport="590${VM_ID}"
 
 # Add rw share for home dir
 homesharepath="${HOME}/PERSISTENT"
diff --git a/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/set_runvirt_variables.inc b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/set_runvirt_variables.inc
index 4c4ccf1d..cd9a573a 100644
--- a/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/set_runvirt_variables.inc
+++ b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/set_runvirt_variables.inc
@@ -4,8 +4,8 @@
 
 VMCHOOSER_DIR="/opt/openslx/vmchooser"
 VMCHOOSER_CONF_DIR="$VMCHOOSER_DIR/config"
-LOGFILE="/var/log/openslx/run-virt.${USER}.$$.log"
 USER="$(whoami)"
+LOGFILE="/var/log/openslx/run-virt.${USER}.$$.log"
 TMPDIR="/tmp/virt/${USER}/$$"
 
 readonly VMCHOOSER_DIR VMCHOOSER_CONF_DIR LOGFILE TMPDIR USER
diff --git a/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_image_access.inc b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_image_access.inc
index 3c4ed330..4eb66028 100644
--- a/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_image_access.inc
+++ b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_image_access.inc
@@ -2,32 +2,40 @@
 # Include: Setup dnbd for image access, nfs/cifs fallback #
 ###########################################################
 
-writelog "Now in setup_image_access.inc ..."
+# This will currently make sure that the variable
+# VM_DISKFILE_RO is set which will contain the
+# absolute path to the disk image to use for the vm
+# session.
+# When using DNBD3 this will differ from SRC_IMG_ABSOLUTE,
+# otherwise it will be identical.
+# In the future DNBD3 (or something else) might provide
+# a CoW layer so we don't need snapshots etc. anymore.
+# This include should set VM_DISKFILE_RW in that case to
+# indicate to the virt plugin that it doesn't need to
+# handle creating a temporary CoW layer itself.
+
+writelog "Setting up disk access for virtualizer/emulator ..."
 
 # Try to use dnbd3 to access the image
-unset vm_diskfile
-unset vm_revision
+unset VM_DISKFILE_RO
 unset dnbd3_fuse_mount_point
-unset dnbd3_tmplog
-if ! which dnbd3-fuse; then
-	writelog "Can't use dnbd3 as dnbd3-fuse binary is not in PATH"
-elif [ -z "$SLX_DNBD3_SERVERS" ] || [ "x$SLX_VM_DNBD3" != "xyes" ]; then
-	writelog "Can't use dnbd3 as no servers are given in config, or SLX_VM_DNBD3 is not set to yes"
-else
+
+setup_dnbd3 () {
 	# Mount path for images mounted with dnbd3-fuse
 	dnbd3_fuse_mount_point="$TMPDIR/dnbd3fuse.mnt"
 	mkdir -p "${dnbd3_fuse_mount_point}"
 	# start dnbd3-fuse in subshell
-	dnbd3_tmplog="$TMPDIR/dnbd3fuse.log"
-	dnbd3_exitflag="$TMPDIR/dnbd3exit$RANDOM"
+	local dnbd3_tmplog="$TMPDIR/dnbd3fuse.log"
+	local dnbd3_exitflag="$TMPDIR/dnbd3exit$RANDOM"
+	local TIMEOUT vm_revision
 	rm -f -- "$dnbd3_exitflag"
 	(
-		dnbd3-fuse -f -o allow_other,max_readahead=262144 -h "$SLX_DNBD3_SERVERS" -i "${imgrelpath}" "${dnbd3_fuse_mount_point}" > "$dnbd3_tmplog" 2>&1
+		dnbd3-fuse -f -o allow_other,max_readahead=262144 -h "$SLX_DNBD3_SERVERS" -i "${SRC_IMG_RELATIVE}" "${dnbd3_fuse_mount_point}" > "$dnbd3_tmplog" 2>&1
 		RET=$?
 		touch "$dnbd3_exitflag"
 		if [ "$RET" != "0" ]; then
 			writelog "dnbd3-fuse stopped working (Exit code $RET)"
-			slxlog "virt-dnbd3-fuse" "dnbd3-fuse stopped/refused serving '${imgrelpath}' from '${SLX_DNBD3_SERVERS}' with error code: $RET" "${dnbd3_tmplog}"
+			slxlog "virt-dnbd3-fuse" "dnbd3-fuse stopped/refused serving '${SRC_IMG_RELATIVE}' from '${SLX_DNBD3_SERVERS}' with error code: $RET" "${dnbd3_tmplog}"
 		fi
 	) &
 	# give it a bit of time
@@ -36,36 +44,55 @@ else
 	for TIMEOUT in 0.5 1 1 OUT; do
 		if [ -r "${dnbd3_fuse_mount_point}/img" ]; then
 			vm_revision="$(grep -m 1 "^Revision:" "${dnbd3_fuse_mount_point}/status" | cut  -d" " -f2)"
-			vm_diskfile="${dnbd3_fuse_mount_point}/img"
-			writelog "DNBD3: $imgrelpath on $vm_diskfile with rid $vm_revision"
-			vmpath="$vm_diskfile"
+			VM_DISKFILE_RO="${dnbd3_fuse_mount_point}/img"
+			writelog "DNBD3: $SRC_IMG_RELATIVE on $VM_DISKFILE_RO with rid $vm_revision"
 			break
 		fi
 		[ "$TIMEOUT" = "OUT" -o -e "$dnbd3_exitflag" ] && break
 		sleep "$TIMEOUT"
 	done
 
-	if [ -z "$vm_diskfile" ]; then
-		slxlog "virt-dnbd3" "No dnbd3 server for ${imgrelpath} found, trying NFS/CIFS..." "$dnbd3_tmplog"
+	if [ -z "$VM_DISKFILE_RO" ]; then
+		slxlog "virt-dnbd3" "No dnbd3 server for ${SRC_IMG_RELATIVE} found, trying NFS/CIFS..." "$dnbd3_tmplog"
 		writelog "No working dnbd3 server found :-("
 	fi
+}
+
+# See if we should setup dnbd3 image access at all
+if ! which dnbd3-fuse; then
+	writelog "Can't use dnbd3 as dnbd3-fuse binary is not in PATH"
+elif [ -z "$SRC_IMG_RELATIVE" ]; then
+	writelog "Can't use dnbd3 as SRC_IMG_RELATIVE is not set"
+elif [ -z "$SLX_DNBD3_SERVERS" ] || [ "x$SLX_VM_DNBD3" != "xyes" ]; then
+	writelog "Can't use dnbd3 as no servers are given in config, or SLX_VM_DNBD3 is not set to yes"
+else
+	setup_dnbd3
 fi
 
-# $vm_diskfile will be empty if dnbd3 is not used or failed. Let's try to fall back to NFS/CIFS via file system
-if [ -z "$vm_diskfile" ]; then
-	new_vmpath=$(ls "${vmpath}.r"* | grep -E -o '\.r[0-9]+$' | grep -o -E '[0-9]+' | sort -n | tail -n 1)
-	[ -n "$new_vmpath" ] && vmpath="${vmpath}.r${new_vmpath}"
-	vm_diskfile="$vmpath"
+# VM_DISKFILE_RO will be empty if dnbd3 is not used or failed to connect.
+# Let's try to fall back to NFS/CIFS via file system
+if [ -z "$VM_DISKFILE_RO" ]; then
+	# Maybe we're reading a dnbd3 directory with RIDs encoded into the filename - use latest one
+	rid_suffix=$(ls -1 "${SRC_IMG_ABSOLUTE}.r"* | grep -E -o '\.r[0-9]+$' | grep -o -E '[0-9]+$' | sort -n | tail -n 1)
+	if [ -n "$rid_suffix" ]; then
+		# found
+		VM_DISKFILE_RO="${SRC_IMAGE_ABSOLUTE}.r${rid_suffix}"
+	elif [ -e "$SRC_IMAGE_ABSOLUTE" ]; then
+		# try name we got from xml in the first place
+		VM_DISKFILE_RO="$SRC_IMAGE_ABSOLUTE"
+	fi
 fi
 
 # Check if virtual machine container file exists
-if ! [ -e "${vmpath}" ]; then
-	slxlog "virt-image-missing" "VM image $vmpath not found!"
-	writelog "Virtual machine image ${vmpath} not found!"
+if [ -z "$VM_DISKFILE_RO" ] || ! [ -e "${VM_DISKFILE_RO}" ]; then
+	slxlog "virt-image-missing" "VM image $VM_DISKFILE_RO not found!"
+	writelog "Virtual machine image ${VM_DISKFILE_RO} not found!"
 	error_user "Das Image für die gewählte Virtuelle Maschine konnte nicht gefunden werden.
 Versuchen Sie zunächst, den Computer komplett neu zu starten. Sollte das Problem bestehen bleiben, wenden Sie sich bitte an den Support."
 	cleanexit 1
 fi
 
-writelog "Virtual machine disk file: $vm_diskfile"
+readonly VM_DISKFILE_RO
+
+writelog "Disk file to use: $VM_DISKFILE_RO"
 
diff --git a/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_vm_hypervisor.inc b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_vm_hypervisor.inc
index ce15524f..7709a85d 100644
--- a/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_vm_hypervisor.inc
+++ b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_vm_hypervisor.inc
@@ -3,30 +3,30 @@
 ##########################################################################
 
 # Get all virtual machine specific stuff from the respective include file
-if [ ! -e "$VMCHOOSER_DIR/$xmlvirt/run-virt.include" ] ; then
-	slxlog "virt-plugin-missing" "Could not find run-virt.include for $xmlvirt ($VMCHOOSER_DIR/$xmlvirt/run-virt.include)"
-	writelog "Failed because of missing ${xmlvirt} plugin."
-	error_user "Konnte den Virtualisierer '$xmlvirt' nicht finden. Starten der Virtuellen Maschine fehlgeschlagen.
+if [ ! -e "$VMCHOOSER_DIR/$PLUGIN_ID/run-virt.include" ] ; then
+	slxlog "virt-plugin-missing" "Could not find run-virt.include for $PLUGIN_ID ($VMCHOOSER_DIR/$PLUGIN_ID/run-virt.include)"
+	writelog "Failed because of missing ${PLUGIN_ID} plugin."
+	error_user "Konnte den Virtualisierer '$PLUGIN_ID' nicht finden. Starten der Virtuellen Maschine fehlgeschlagen.
 	Starten Sie den Computer neu und wenden Sie sich an den Support, wenn das Problem weiterhin besteht."
 	cleanexit 1
 fi
 
-self="${xmlvirt}"
+self="${PLUGIN_ID}"
 
-if ! bash -n "$VMCHOOSER_DIR/$xmlvirt/run-virt.include"; then
-	slxlog "virt-plugin-syntax" "run-virt.include for $xmlvirt contains syntax errors (bash -n run-virt.include failed)"
-	writelog "Erroneous run-virt.include for $xmlvirt (syntax check)"
-	error_user "Das Start-Script für den Virtualisierer '$xmlvirt' ist fehlerhaft.
+if ! bash -n "$VMCHOOSER_DIR/$PLUGIN_ID/run-virt.include"; then
+	slxlog "virt-plugin-syntax" "run-virt.include for $PLUGIN_ID contains syntax errors (bash -n run-virt.include failed)"
+	writelog "Erroneous run-virt.include for $PLUGIN_ID (syntax check)"
+	error_user "Das Start-Script für den Virtualisierer '$PLUGIN_ID' ist fehlerhaft.
 	Starten Sie den Computer neu und wenden Sie sich an den Support, wenn das Problem weiterhin besteht."
 	cleanexit 1
 fi
 
 setup_vm_commandline () {
 	# Now including the hypervisor specific include file:
-	if ! source "$VMCHOOSER_DIR/$xmlvirt/run-virt.include"; then
-		slxlog "virt-plugin-error" "run-virt.include for $xmlvirt could not be sourced properly."
-		writelog "Erroneous run-virt.include for ${xmlvirt}? Source returned != 0"
-		error_user "Das Start-Script für den Virtualisierer '$xmlvirt' hat einen fehlercode zurückgegeben.
+	if ! source "$VMCHOOSER_DIR/$PLUGIN_ID/run-virt.include"; then
+		slxlog "virt-plugin-error" "run-virt.include for $PLUGIN_ID could not be sourced properly."
+		writelog "Erroneous run-virt.include for ${PLUGIN_ID}? Source returned != 0"
+		error_user "Das Start-Script für den Virtualisierer '$PLUGIN_ID' hat einen fehlercode zurückgegeben.
 		Starten Sie den Computer neu, falls es beim Ausführen der VM zu Problemen kommt
 		und wenden Sie sich an den Support, wenn das Problem weiterhin besteht."
 	fi
diff --git a/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/vmchooser_runvirt_functions.inc b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/vmchooser_runvirt_functions.inc
index c0d17dbe..7519a48d 100644
--- a/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/vmchooser_runvirt_functions.inc
+++ b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/vmchooser_runvirt_functions.inc
@@ -77,3 +77,22 @@ rv_clean_string() {
 		tr '[A-Z]' '[a-z]' | tr -d -c '[a-z0-9\-]'
 	fi
 }
+
+# Check if the given variables are set (empty or not)
+isset() {
+	while [ $# -gt 0 ]; do
+		[ -z "${!1+x}" ] && return 1
+		shift
+	done
+	return 0
+}
+
+# Check if the given variables are not empty
+notempty() {
+	while [ $# -gt 0 ]; do
+		[ -z "${!1}" ] && return 1
+		shift
+	done
+	return 0
+}
+
diff --git a/remote/modules/run-virt/data/opt/openslx/vmchooser/vmchooser-run_virt b/remote/modules/run-virt/data/opt/openslx/vmchooser/vmchooser-run_virt
index 10943c51..b945cca2 100755
--- a/remote/modules/run-virt/data/opt/openslx/vmchooser/vmchooser-run_virt
+++ b/remote/modules/run-virt/data/opt/openslx/vmchooser/vmchooser-run_virt
@@ -19,8 +19,8 @@
 #      fied virtualization tool.
 ################################################################################
 
-RUNVIRTINCLUDEDIR=/opt/openslx/vmchooser/run-virt-includes
-xmlfile="$1"
+declare -rg RUNVIRTINCLUDEDIR=/opt/openslx/vmchooser/run-virt-includes
+declare -rg xmlfile="$1"
 
 # Functions needed by vmchooser-run_virt (writelog(), cleanexit(), rv_clean_string())
 if ! source "${RUNVIRTINCLUDEDIR}/vmchooser_runvirt_functions.inc"; then
@@ -29,10 +29,20 @@ if ! source "${RUNVIRTINCLUDEDIR}/vmchooser_runvirt_functions.inc"; then
 fi
 
 trap 'trap "" SIGINT SIGTERM; cleanexit' SIGINT SIGTERM
+
 # Define default dirs / get configs
 source "${RUNVIRTINCLUDEDIR}/set_runvirt_variables.inc"
-# Function to detect whether we can use the new way (vmx via http) or the old way (legacy):
-source "${RUNVIRTINCLUDEDIR}/detect_legacy.inc" # This yields LEGACY, IMGUUID, IMGVMX
+
+# Read needed variables from XML file
+source "${RUNVIRTINCLUDEDIR}/get_xml_file_variables.inc"
+
+# Download meta data from server (e.g. vmx for vmware)
+source "${RUNVIRTINCLUDEDIR}/download_vm_metadata.inc"
+
+if ! isset IMGUUID TMPCONFIG TMPDIR USER; then
+	slxlog "run-virt" "Internal sanity check failed: One of IMGUUID TMPCONFIG TMPDIR USER is not set."
+	cleanexit 1
+fi
 
 if [ "$LEGACY" ]; then
 
@@ -54,13 +64,6 @@ fi
 
 # Proper meta data received - proceed normally
 
-# check for important files used (filecheck()) - vestigial?
-# This include does not currently work. TODO.
-# source ${RUNVIRTINCLUDEDIR}/check_runvirt_needed_files.inc && filecheck
-
-# Read needed variables from XML file
-source ${RUNVIRTINCLUDEDIR}/get_xml_file_variables.inc
-
 # Helper that looks for virtualizer-specific include, show error to user if not found
 source "${RUNVIRTINCLUDEDIR}/setup_vm_hypervisor.inc"
 
@@ -72,22 +75,22 @@ source "${RUNVIRTINCLUDEDIR}/setup_firewall.inc" || writelog "Could not source s
 setup_firewall || writelog "Could not run setup_firewall"
 
 # Sound setup
-source ${RUNVIRTINCLUDEDIR}/setup_sound.inc
+source "${RUNVIRTINCLUDEDIR}/setup_sound.inc"
 
 # Declaration of hardware relatedt variables
-source ${RUNVIRTINCLUDEDIR}/set_runvirt_hardware_variables.inc
+source "${RUNVIRTINCLUDEDIR}/set_runvirt_hardware_variables.inc"
 
 # Start printer daemon
-source ${RUNVIRTINCLUDEDIR}/setup_printer_lpd.inc
+source "${RUNVIRTINCLUDEDIR}/setup_printer_lpd.inc"
 
 # Setup virtual floppy b: for windows guests with config.xml, openslx.exe etc.
-source ${RUNVIRTINCLUDEDIR}/setup_virtual_floppy.inc
+source "${RUNVIRTINCLUDEDIR}/setup_virtual_floppy.inc"
 
 # Try to use dnbd3 to access the image, nfs/cifs fallback
-source ${RUNVIRTINCLUDEDIR}/setup_image_access.inc
+source "${RUNVIRTINCLUDEDIR}/setup_image_access.inc"
 
 # Window manager required for handling of popups etc.
-source ${RUNVIRTINCLUDEDIR}/start_windowmanager.inc
+source "${RUNVIRTINCLUDEDIR}/start_windowmanager.inc"
 
 # Source run-virt.include of virtualizer
 setup_vm_commandline
@@ -95,9 +98,9 @@ setup_vm_commandline
 # It should have set this variable if all went well
 if [ -z "${VIRTCMD}" ]; then
 	error_user "Fehler beim Starten der VM-Sitzung" "
-Das Start-Script für den Virtualisierer $xmlvirt hat kein Kommando
+Das Start-Script für den Virtualisierer $PLUGIN_ID hat kein Kommando
 zum Starten der Sitzung definiert. Kann Sitzung nicht initialisieren."
-	slxlog "virt-plugin-error" "run-virt.include for $xmlvirt did not set VIRTCMD"
+	slxlog "virt-plugin-error" "run-virt.include for $PLUGIN_ID did not set VIRTCMD"
 	cleanexit 1
 fi
 
diff --git a/remote/modules/vbox/data/opt/openslx/vmchooser/virtualbox/machine.include b/remote/modules/vbox/data/opt/openslx/vmchooser/virtualbox/machine.include
index 1f0b209a..344ccc48 100644
--- a/remote/modules/vbox/data/opt/openslx/vmchooser/virtualbox/machine.include
+++ b/remote/modules/vbox/data/opt/openslx/vmchooser/virtualbox/machine.include
@@ -11,10 +11,14 @@
 # -----------------------------------------------------------------------------
 # Include file (general template) for run-virt.include of the virtualbox plugin
 
+# TODO: Move this server side (just like vmware)
+# !! A lot of variable names have changed and are NOT updated here !!
+# Oh and for the love of god remove the above comment when this works again
+
 cat << EOF > "${machconfig}"
 <?xml version="1.0"?>
 <VirtualBox xmlns="http://www.innotek.de/VirtualBox-settings" version="1.14-linux">
-  <Machine uuid="{${machineuuid}}" name="${vm_name}" OSType="${vmostype}">
+  <Machine uuid="{${machineuuid}}" name="${VM_DISPLAYNAME}" OSType="${VM_OS_TYPE}">
     <MediaRegistry>
       <HardDisks>
         <HardDisk uuid="{${diskuuid}}" location="${diskfile}" format="${imgfmt}" type="${imgtype}"/>
diff --git a/remote/modules/vbox/data/opt/openslx/vmchooser/virtualbox/run-virt.include b/remote/modules/vbox/data/opt/openslx/vmchooser/virtualbox/run-virt.include
index 1b116f32..59dd712d 100755
--- a/remote/modules/vbox/data/opt/openslx/vmchooser/virtualbox/run-virt.include
+++ b/remote/modules/vbox/data/opt/openslx/vmchooser/virtualbox/run-virt.include
@@ -14,261 +14,165 @@
 #    - component for virtualbox of the vmchooser plugin vmchooser-run_virt
 ################################################################################
 
+[ -r /run/hwinfo ] && source /run/hwinfo
+
 ################################################################################
 ### declaration of default variables
 ################################################################################
 
-VMCHOOSERVBOX="/opt/openslx/vmchooser/${self}"
-confdir="${TMPDIR}/vbox"	# dir for configs
-export VBOX_USER_HOME=${confdir}		# instead of $HOME/.VirtualBox
-# define dirs and files which can be removed after exit, be carefull!
-# TODO: Machanism not in use anymore. A better approach would be anyways to
-# Define a fixed directory which can be deleted recursively on exit. $TMPDIR
-# would be a start.
-#RMDIRS="${snapshotdir} ${confdir} /tmp/virt/.vbox-${USER}-ipc"
-# rm -rf ${RMDIRS} 2>/dev/null
-machfolder="${confdir}/Machines"
-# use vm_shortname for dir and config names since vm_name can be very long
-machconfig="${machfolder}/${vm_shortname}/${vm_shortname}.xml"
-diskfolder="${confdir}/HardDisks"
-snapshotdir=${machfolder}/${vm_shortname}/Snapshots
-mkdir -p ${diskfolder} ${snapshotdir} 2>/dev/null
-[ -z "${diskless}" ] && diskless=0	# check if diskless var empty?
-guestaudio="HDA"			# default guest audio controller (SB16, AC97, HDA)
-vb_network_card="82540EM"		# default guest network adaptor (Am79C970A, Am79C973, 82540EM)
+if ! isset VM_NAME_CLEAN IMG_BASENAME SRC_IMG_ABSOLUTE VM_OS_TYPE; then
+  env=$(mktemp)
+  env > "$env"
+  slxlog -d "virt-vbox-init" "A required variable is not set." "$env"
+  writelog "Incomplete variable set passed from main run-virt"
+  error_user "Wichtige variablen, die das VBox Plugin benötigt, wurden nicht
+gesetzt. Kann die VM nicht starten."
+  cleanexit 1
+fi
+
+declare -rg VMCHOOSERVBOX="/opt/openslx/vmchooser/${self}"
+declare -rg VBOX_ROOT="${TMPDIR}/vbox"	# dir for configs
+declare -rg VBOX_MACHINES_DIR="${VBOX_ROOT}/Machines"
+declare -rg VBOX_SNAPSHOT_DIR="${VBOX_MACHINES_DIR}/${VM_NAME_CLEAN}/Snapshots"
+declare -rg VBOX_HDD_DIR="${VBOX_ROOT}/HardDisks"
+declare -rg VBOX_HDD_LINK="${VBOX_HDD_DIR}/${IMG_BASENAME}"
+
+export VBOX_USER_HOME="${VBOX_ROOT}"		# instead of $HOME/.VirtualBox
+
+# use VM_NAME_CLEAN for dir and config names since VM_DISPLAYNAME can be very long
+VBOX_MACHINE_CONFIG="${VBOX_MACHINES_DIR}/${VM_NAME_CLEAN}/${VM_NAME_CLEAN}.xml"
+mkdir -p "${VBOX_HDD_DIR}" "${VBOX_SNAPSHOT_DIR}" 2>/dev/null
 enable2d="true"				# default setting for accelerated 2D grapics (OS dependent)
 vram="128"				# set default graphics ram
+snapshotuuid="34f617be-192a-46b3-a8ae-bce1029e093f"	# snapshot UUID is static
 
-# configure our own rwimg, empty image which we provide
-if [ "${imgmode}" = "rwimg" ]; then
-  imgname="${vm_shortname}.vdi"		# what is our rwimg called?
-  vmpath=${imgpath}/${imgname}
-  if ! [ -e "${vmpath}" ]; then
-    cat /opt/openslx/vmchooser/virtualbox/rwimg.vdi.gz | gunzip > "${vmpath}"
+# link to image, determine extension (type)
+imgfmt=$(echo ${SRC_IMG_ABSOLUTE##*.} | tr '[a-z]' '[A-Z]')
+if [ -n "$VM_DISKFILE_RW" ]; then
+  ln -sf "${VM_DISKFILE_RW}" "${VBOX_HDD_LINK}"
+else
+  ln -sf "${VM_DISKFILE_RO}" "${VBOX_HDD_LINK}"
+  # image is RO, we only support VDI?
+  if [ "$imgfmt" != "VDI" ]; then
+    writelog "Image is not VDI, cannot create snapshot.."
+    error_log "Die gewählte VM nutzt VBox, hat aber kein VDI image (sondern '$imgfmt'), kann VM nicht starten."
+    cleanexit 1
   fi
 fi
 
-# link to image
-diskfile="${diskfolder}/${imgname}"
-[ ${diskless} -eq 0 ] && ln -sf ${vmpath} ${diskfile}
-
-# check the file type
-if echo ${imgname} | grep -qiE "vdi|vhd" && [ ${diskless} -eq 0 ]; then
-  imgfmt=$(echo ${imgname##*.} | tr "[a-z]" "[A-Z]")
-elif [ ${diskless} -eq 0 ]; then
-  writelog "${imgname} is not a valid image format (vdi|vhd), exiting!"
-  cleanexit 1
-fi
-
-npaging="false"		# nested paging: Default: not enabled
-enablevt="false"	# VT: Default: not enabled
-[ ${vtflag} -eq 0 ] && cpu_cores=1	# check for VT, if not available only 1 cpu supported
-[ ${vtflag} -eq 1 ] && enablevt="true"
 
 # Setting some default variables
 shfolders="TRUE"
+enablevt="true"
 
 # set some base configuration depending on the guest operating system
-case "${vmostype}" in
-  win31*)
-    guestaudio="SB16"
-    vb_network_card="Am79C973"
-    vmostype="Windows31"
+case "${VM_OS_TYPE}" in
+  Windows31)
     mem="32"
     vram="16"
     cpu_cores=1
     enablevt="false"
     shfolders="FALSE"
-  ;;
-  winnt*)
-    guestaudio="SB16"
-    vb_network_card="Am79C973"
-    vmostype="Windows31"
-    mem="32"
+    ;;
+  WindowsNT)
+    mem="4096"
     vram="16"
-    cpu_cores=1
+    cpu_cores=4
     enablevt="false"
     shfolders="FALSE"
-  ;;
-  win95*)
-    vmostype="Windows95"
-    guestaudio="SB16"
-    vb_network_card="Am79C973"
-    mem="92"
+    ;;
+  Windows95)
+    mem="128"
     vram="32"
     cpu_cores=1
     enablevt="false"
     shfolders="FALSE"
-  ;;
-  win98*)
-    vmostype="Windows98"
-    guestaudio="SB16"
-    vb_network_card="Am79C973"
+    ;;
+  Windows98)
     mem="256"
     vram="64"
     cpu_cores=1
     shfolders="FALSE"
-  ;;
-  winme*)
-    vmostype="WindowsMe"
-    guestaudio="AC97"
-    vb_network_card="Am79C973"
+    ;;
+  WindowsMe)
     mem="256"
     vram="64"
     cpu_cores=1
     shfolders="FALSE"
-  ;;
-  winxp*|windowsxp*)
-    vmostype="WindowsXP"
-    guestaudio="AC97"
-  ;;
-  winvista*|windowsvista*)
-    vmostype="WindowsVista"
-  ;;
-  windows7*)
-    vmostype="Windows7"
-  ;;
-  windows8*)
-    vmostype="Windows8"
-  ;;
-  linux*|*ubuntu*|*suse*|debian*|*sci*)
-    if echo "${vmostype}" | grep -q "64"; then
-      vmostype="Linux26_64"
-      # check for vtflag
-      if [ ${vtflag} -ne 1 ]; then
-        writelog "You are trying to boot a 64 bit OS without a VT enabled CPU"
-        writelog "This is not supported, exiting!"
-        cleanexit 1
-      fi
-      # check if host is only 32 bit, then use only 1 cpu (only 1 supported)
-      if echo "${host_arch}" | grep -qE "i.86"; then
-        cpu_cores=1
-      fi
-    else
-      vmostype="Linux26"
-    fi
-  ;;
-  os2*)
+    ;;
+  WindowsXP)
+    ;;
+  WindowsVista)
+    ;;
+  Windows7)
+    ;;
+  Windows8)
+    ;;
+  OS2eCS)
     mem="256"
-    vmostype="OS2eCS"
     cpu_cores=1
     enable2d="false"
-  ;;
-  macos*|MacOS*)
-    vmostype="MacOS"
+    ;;
+  MacOS)
     enable2d="false"
-  ;;
+    ;;
+  Linux*)
+    ;;
   *)
-    vmostype="Other"
+    VM_OS_TYPE="Other"
     enable2d="false"
-  ;;
+    ;;
 esac
 
+if [ "$HW_KVM" != "ENABLED" ]; then
+  enablevt="false"
+  cpu_cores=1 # check for VT, if not available only 1 cpu supported
+fi
+
 writelog "Directories:"
-writelog "\tConfig dir:\t\t$confdir"
-writelog "\tMachines dir:\t\t$machfolder"
-writelog "\tMachine config:\t\t$machconfig"
-[ ${diskless} -eq 0 ] && writelog "\tHardDisks dir:\t\t$diskfolder"
+writelog "\tConfig dir:\t\t$VBOX_ROOT"
+writelog "\tMachines dir:\t\t$VBOX_MACHINES_DIR"
+writelog "\tMachine config:\t\t$VBOX_MACHINE_CONFIG"
 
 ################################################################################
 ### Hardware checks
 ################################################################################
 
 # remove ':' from MAC addr for vbox and generate a VDE (virtual device ethernet)
-# MAC addr from the first one (put in prefix 0DE)
+# MAC addr from the first one (put in prefix 00DE)
 macaddr=$(echo ${macaddr} | sed 's/://g')
 vdemacaddr=$(echo ${macaddr} | sed 's/^..../00DE/g')
 
 machineuuid="00000000-0000-0000-0000-${macaddr}"	# machine UUID, MAC addr part of it
 machineuuid=$(echo ${machineuuid} | tr "[A-Z]" "[a-z]")	# cosmetical, since UUID in lower case
-# get UUID of VBox image, if not diskless
-[ ${diskless} -eq 0 ] && diskuuid=$(VBoxManage -q showvdiinfo ${diskfile} \
-					| grep UUID | grep -v "Parent UUID" | awk '{print $2}' \
-					| grep -v use )	# nec. for VBox >= 4
 
-imgtype="Immutable"					# make disk immutable
-snapshotuuid="34f617be-192a-46b3-a8ae-bce1029e093f"	# snapshot UUID is static
-imageuuid=${snapshotuuid}	# imageuuid in machine.include, default snapshotuuid
-
-# check if rw image
-# remove disk and add rwimg if set
-if echo "${imgmode}" | grep -q rw; then
-  # lock existing?
-  if [ -e "${vmpath}.lock" ]; then
-    writelog "This rw image is already in use."
-    writelog "Found lock: ${vmpath}.lock, exiting!"
-    writelog "Remove lock if you are sure that this is not the case"
-    cleanexit 1
-  # image rw?
-  elif ! [ -w ${vmpath} ]; then
-    writelog "You defined mode rw, but image ${vmpath} is not rw! \c"
-    writelog "Please correct, exiting!"
-    cleanexit 1
-  fi
-  touch "${vmpath}.lock"		# add lock
-  #RMDIRS="${RMDIRS} ${vmpath}.lock"	# remove lock after VM stopped TODO See note at the top
+# get UUID of VBox image
+diskuuid=$(VBoxManage -q showvdiinfo ${VBOX_HDD_LINK} \
+            | grep UUID | grep -v "Parent UUID" | awk '{print $2}' \
+            | grep -v use )	# nec. for VBox >= 4
+
+
+if [ -n "$VM_DISKFILE_RW" ]; then
+  # Image is already RW - easy
   imgtype="Normal"
-  imageuuid=${diskuuid}			# replace image uuid in machine config
-elif [ ${diskless} -eq 0 ]; then
-  # use temp disk as snapshot
-  cat ${VMCHOOSERVBOX}/empty-diff.vdi.gz \
-    | gunzip > "${snapshotdir}/{${snapshotuuid}}.vdi"
-  # patch the disk file uuid into the snapshot vdi file
-  dd if=${diskfile} of="${snapshotdir}/{${snapshotuuid}}.vdi" seek=424 \
-    skip=392 bs=1 count=16 conv=notrunc
+  imageuuid=${diskuuid}
+else
+  # use temp disk as snapshot to get CoW
+  imgtype="Immutable"					# make disk immutable
+  imageuuid=${snapshotuuid}
+  < "${VMCHOOSERVBOX}/empty-diff.vdi.gz" gunzip > "${VBOX_SNAPSHOT_DIR}/{${snapshotuuid}}.vdi"
+  # patch the disk file uuid into the snapshot vdi file:
+  # We read from offset 424 in the source HDD and write to offset 392 in out prepared
+  # CoW container. 16 bytes will be copied, which is the binary UUID
+  # TODO: This requires the image to be a vdi/vdh; Afaik, vbox supports vmdk,
+  # so this code would break in that case. Can we use the diskuuid we got via
+  # VBoxManage, convert to binary, and patch it
+  dd if=${VBOX_HDD_LINK} of="${VBOX_SNAPSHOT_DIR}/{${snapshotuuid}}.vdi" seek=424 \
+    skip=392 bs=16 count=1 conv=notrunc
 fi
 
-# TODO: MEM muss noch angepasst werden. Maschine crasht wenn mehr als 50% MEM
-# memory part equal to vmware plugin
-# percentage of memory to use for virtualbox in standard case
-#if [ -n "${forcemem}" ]; then
-#  mem="${forcemem}"
-#else
-#  permem=30
-#  if [ "${totalmem}" -ge "1600" ]; then
-#    permem=40
-#  fi
-#  # check if /tmp is on harddisk
-#  if grep -qe "/dev/.* /tmp " /proc/mounts ; then
-#    permem=60
-#    id44="1"
-#    # Hack, if more than 2,5G RAM use 40% of Ram and write vmem into Ram as well
-#    # (40% vmware | 40% confdir(vmem...) | 20% host
-#    # VMplayer 2+ issue
-#    # TODO: makes this sense for vbox?
-#    #if [ "${totalmem}" -ge "2500" ]; then
-#      #permem=40
-#      #rmdir ${snapshotdir}
-#      #snapshotdirold=${snapshotdir}
-#      #snapshotdir=/dev/shm/${self}/${USER}/${VM_ID}
-#      #mkdir -p ${snapshotdir}
-#      #ln -sf ${snapshotdir} ${snapshotdirold}
-#    #fi
-#  fi
-#  mem=$(expr ${totalmem} / 100 \* ${permem})
-#  if [ "${id44}" = "1" ]; then
-#    hostmem=$(expr ${totalmem} - ${mem})
-#  else
-#    hostmem=$(expr ${totalmem} - ${mem} - ${mem})
-#  fi
-#  #permem=40
-#  #mem=$(expr ${totalmem} * ${permem})
-#fi
-
-# translate network cards
-case "${network_card}" in
-  e1000)
-    vb_network_card="82540EM"
-  ;;
-  virtio)
-    vb_network_card="virtio"
-  ;;
-  *)
-    network_card="pcnet"
-    vb_network_card="Am79C973"
-esac
-
 # translate network kinds (nat, bridged, host-only)
+# TODO: Server should prepare this in returned xml
 case "${network_kind}" in
   bridge*)
     network_kind='HostOnlyInterface name="vboxnet0"'
@@ -280,57 +184,19 @@ case "${network_kind}" in
     network_kind='HostOnlyInterface name="vboxnet1"'
 esac
 
-# configure 3d settings
-case "${enable3d}" in
-  *true*|*yes*)
-    enable3d="true"
-    ;;
-  *)
-    enable3d="false"
-    ;;
-esac
+boot="HardDisk"
 
-# translate boot, use if set else set to HardDisk
-# usually support for a,c,d,n, stands for Floppy, HD, CD-ROM, Network
-# support nfs and tftp as well
-case ${boot} in
-  n*|tftp)
-    boot="Network"
-    if [ "${network_kind}" = "NAT" ] && [ -n "${virtualbox_tftpdir}" ]; then
-      vm_name=${vm_shortname}	# use vm_shortname to avoid Problems /w TFTP in NAT
-      mkdir -p ${confdir}/TFTP	# link TFTP dir for NAT TFTP boots
-      if [ -e ${virtualbox_tftpdir}/pxelinux.0 ]; then
-        cp ${virtualbox_tftpdir}/pxelinux.0 ${confdir}/TFTP/${vm_name}.pxe
-      else
-        writelog "${virtualbox_tftpdir}/pxelinux.0 not found!"
-        writelog "Network boot won't work, exiting!"
-        cleanexit 1
-      fi
-      for i in $(ls ${virtualbox_tftpdir}); do
-        ln -sf ${virtualbox_tftpdir}/${i} ${confdir}/TFTP/${i}
-      done
-    fi
-  ;;
-  # later maybe c|disk|hd*|sd*) for HD and d|cd*) for CD-ROM
-  *) 
-    boot="HardDisk"
-  ;;
-esac
-
-vrdpport=${remotedesktopport}	# external GUI
-
-[ ${diskless} -eq 0 ] && writelog "\tSnapshots dir:\t\t$snapshotdir"
+writelog "\tSnapshots dir:\t\t$VBOX_SNAPSHOT_DIR"
 writelog "Diskimage:"
-[ ${diskless} -eq 0 ] && writelog "\tDisk file:\t\t$diskfile"
-[ ${diskless} -eq 0 ] && writelog "\tDisk format:\t\t$imgfmt"
-[ ${diskless} -eq 0 ] && writelog "\tDisk type:\t\t$imgtype"
-  writelog "\tVMostype:\t\t$vmostype"
-  writelog "\tMachine UUID:\t\t$machineuuid"
-[ ${diskless} -eq 0 ] && writelog "\tDisk UUID:\t\t$diskuuid"
+writelog "\tDisk file:\t\t$VBOX_HDD_LINK"
+writelog "\tDisk type:\t\t$imgtype"
+writelog "\tVMostype:\t\t$VM_OS_TYPE"
+writelog "\tMachine UUID:\t\t$machineuuid"
+writelog "\tDisk UUID:\t\t$diskuuid"
 writelog "Virtual Hardware:"
 writelog "\tCPU cores:\t\t${cpu_cores}\c"
-[ ${vtflag} -eq 0 ] && writelog ""
-[ ${vtflag} -eq 1 ] && writelog " (VT enabled CPU)"
+writelog ""
+[ "$HW_KVM" = "ENABLED" ] && writelog " (VT enabled CPU)"
 writelog "\tGuest RAM:\t\t${mem} MB"
 # echo nur wenn hostmem gesetzt
 [ -n "${hostmem}" ] && writelog "\tHost RAM:\t\t${hostmem} MB"
@@ -338,10 +204,7 @@ writelog "\tMAC address:\t\t$macaddr"
 writelog "\tNetwork card:\t\t${vb_network_card}"
 writelog "\tNetwork kind:\t\t${network_kind}"
 writelog "\tBooting from:\t\t${boot}\c"
-[ ${diskless} -eq 0 ] && writelog ""
-[ ${diskless} -eq 1 ] && writelog " 'diskless'"
-# TODO: server start activate via xml, etc...
-#writelog "\tGuest VRDP port:\t${vrdpport}"
+writelog ""
 writelog "\tCD-ROM1:\t\t${cdrom0}"
 #writelog "\tCD-ROM2:\t\t${cdrom1}"
 writelog "\tFloppy_A:\t\t${floppy0}"
@@ -357,60 +220,31 @@ writelog "\tShared Folders '${sharename}':\t${sharepath}"
 
 # Shares given?
 if [ "x$shfolders" != "xFALSE" ]; then
-	sharelist="<SharedFolders>
+  sharelist="<SharedFolders>
         <SharedFolder name=\"${homesharename}\" hostPath=\"${homesharepath}\" writable=\"true\"/>
         <SharedFolder name=\"${commonsharename}\" hostPath=\"${commonsharepath}\" writable=\"true\"/>
       </SharedFolders>"
 else
-	sharelist=''
+  sharelist=''
 fi
 
-source ${VMCHOOSERVBOX}/virtualbox.include	# create Virtualbox.xml
+source "${VMCHOOSERVBOX}/virtualbox.include"  # create Virtualbox.xml
 
 # remove snapshot disk when using rw images
 if [ "${imgtype}" != "Immutable" ]; then
-  sed -i "/${snapshotuuid}/d" "${confdir}/VirtualBox.xml"
+  sed -i "/${snapshotuuid}/d" "${VBOX_ROOT}/VirtualBox.xml"
 fi
 
 # TODO: add rawdisk if requested
 #"raw.vmdk" format="VMDK" type="Writethrough"/>
 
-source ${VMCHOOSERVBOX}/machine.include	# create machine.xml
+source "${VMCHOOSERVBOX}/machine.include" # create machine.xml
 
 # remove CD-ROM if not available
 if [ "${cdrom0}" != "TRUE" ]; then
-  sed -i "/HostDrive/d" ${machconfig}
-  sed -i '/AttachedDevice.*type="DVD"/d' ${machconfig}
-  sed -i "/<!-- PLEASE DO NOT REMOVE THIS COMMENT (CD)!!! -->/d" ${machconfig}
-fi
-
-# if diskless remove all disks
-if [ ${diskless} -eq 1 ]; then
-  sed -i "/<HardDisk/d;/<\/HardDisk/d" "${confdir}/VirtualBox.xml"
-  sed -i "/${imageuuid}/d" ${machconfig}
-  sed -i '/AttachedDevice type="HardDisk"/d' ${machconfig}
-  sed -i "/<!-- PLEASE DO NOT REMOVE THIS COMMENT (HD)!!! -->/d" ${machconfig}
-fi
-
-# define redirects
-if [ ${redirects} -ge 1 ]; then
-  (( i=1 ))
-  writelog "\tGuest redirects:\t\c"
-  while [ ${i} -le ${redirects} ]; do
-    extradataitem='<ExtraDataItem name="VBoxInternal/Devices'
-    extradataitem="${extradataitem}/${network_card}/0/LUN#0/Config"
-    extradataitem="${extradataitem}/${redirect_name[$i]}/"
-    extradataprotocol="Protocol\" value=\"${redirect_proto[$i]}\"/>"
-    extradatahostport="HostPort\" value=\"${redirect_hport[$i]}\"/>"
-    extradataguestport="GuestPort\" value=\"${redirect_gport[$i]}\"/>"
-    sed -i "s,</ExtraData>,  ${extradataitem}${extradataguestport}\n\
-      ${extradataitem}${extradatahostport}\n\
-      ${extradataitem}${extradataprotocol}\n\
-    </ExtraData>," "${machconfig}"
-    writelog "${tabspace}${redirect_name[$i]} port: ${redirect_hport[$i]}"
-    tabspace='\t\t\t\t'
-    (( i=$i+1 ))
-  done
+  sed -i "/HostDrive/d" "${VBOX_MACHINE_CONFIG}"
+  sed -i '/AttachedDevice.*type="DVD"/d' "${VBOX_MACHINE_CONFIG}"
+  sed -i "/<!-- PLEASE DO NOT REMOVE THIS COMMENT (CD)!!! -->/d" "${VBOX_MACHINE_CONFIG}"
 fi
 
 ################################################################################
diff --git a/remote/modules/vbox/data/opt/openslx/vmchooser/virtualbox/virtualbox.include b/remote/modules/vbox/data/opt/openslx/vmchooser/virtualbox/virtualbox.include
index 62143c54..70a036a8 100644
--- a/remote/modules/vbox/data/opt/openslx/vmchooser/virtualbox/virtualbox.include
+++ b/remote/modules/vbox/data/opt/openslx/vmchooser/virtualbox/virtualbox.include
@@ -11,7 +11,7 @@
 # -----------------------------------------------------------------------------
 # Include file (general template) for run-virt.include of the virtualbox plugin
 
-cat << EOF > "${confdir}/VirtualBox.xml"
+cat << EOF > "${VBOX_ROOT}/VirtualBox.xml"
 <VirtualBox xmlns="http://www.innotek.de/VirtualBox-settings" version="1.12-linux">
   <Global>
     <ExtraData>
@@ -27,7 +27,7 @@ cat << EOF > "${confdir}/VirtualBox.xml"
       <ExtraDataItem name="GUI/TrayIcon/Enabled" value="false"/>
     </ExtraData>
     <MachineRegistry>
-      <MachineEntry uuid="{${machineuuid}}" src="Machines/${vm_shortname}/${vm_shortname}.xml"/>
+      <MachineEntry uuid="{${machineuuid}}" src="Machines/${VM_NAME_CLEAN}/${VM_NAME_CLEAN}.xml"/>
     </MachineRegistry>
     <MediaRegistry>
       <HardDisks>
diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/determine_hardware_limitations.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/determine_hardware_limitations.inc
index 84d959ea..11ea2e3a 100644
--- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/determine_hardware_limitations.inc
+++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/determine_hardware_limitations.inc
@@ -9,116 +9,116 @@ sound="es1371"
 
 # define hardware configuration depending on the guest OS used
 # this needs to be fixed and is the base for the creation of new VMs
-case "$vmostype" in
+case "$VM_OS_TYPE" in
 	win31*|windows31*)
-		vmostype="win31"
+		VM_OS_TYPE="win31"
 		shfolders="FALSE"
 		sound="sb16"
 		MAXMEM="32"
 		MAXCORES="1"
 	;;
 	winnt*|windowsnt*)
-		vmostype="winnt"
+		VM_OS_TYPE="winnt"
 		shfolders="FALSE"
 		sound="sb16"
 		MAXMEM="1000"
 		MAXCORES="2"
 	;;
 	win95*|windows95*)
-		vmostype="win95"
+		VM_OS_TYPE="win95"
 		shfolders="FALSE"
 		MAXMEM="96"
 		MAXCORES="1"
 	;;
 	win98*|windows98*)
-		vmostype="win98"
+		VM_OS_TYPE="win98"
 		MAXMEM="256"
 		MAXCORES="1"
 	;;
 	winme*|windowsme*)
-		vmostype="winme"
+		VM_OS_TYPE="winme"
 		MAXMEM="384"
 		MAXCORES="1"
 	;;
 	win2000|windows2000|win2000pro*)
-		vmostype="win2000pro"
+		VM_OS_TYPE="win2000pro"
 		MAXMEM="4000"
 		MAXCORES="2"
 	;;
 	win2000srv*|windows2000srv*|win2000serv*|windows2000serv*)
-		vmostype="win2000serv"
+		VM_OS_TYPE="win2000serv"
 		shfolders="FALSE"
 		MAXMEM="4000"
 		MAXCORES="4"
 	;;
 	win2000adv*|windows2000adv*|win2000dat*|windows2000dat*)
-		vmostype="win2000advserv"
+		VM_OS_TYPE="win2000advserv"
 		shfolders="FALSE"
 		MAXMEM="8000"
 		MAXCORES="8"
 	;;
 	winnet*64|win*2003*64|windowsnet*64)
-		vmostype="winnetstandard-64"
+		VM_OS_TYPE="winnetstandard-64"
 		MAXMEM="8000"
 		MAXCORES="8"
 	;;
 	winnet*|win*2003*|windowsnet*)
-		vmostype="winnetstandard"
+		VM_OS_TYPE="winnetstandard"
 		MAXMEM="4000"
 		MAXCORES="8"
 	;;
 	winxphome*|windowsxphome*)
-		vmostype="winxphome"
+		VM_OS_TYPE="winxphome"
 		MAXMEM="4000"
 		MAXCORES="2"
 	;;
 	winxp*64|windowsxp*64)
-		vmostype="winxppro-64"
+		VM_OS_TYPE="winxppro-64"
 		MAXMEM="8000"
 		MAXCORES="8"
 	;;
 	winxp*|windowsxp*)
-		vmostype="winxppro"
+		VM_OS_TYPE="winxppro"
 		MAXMEM="4000"
 		MAXCORES="4"
 	;;
 	winvista-64)
-		vmostype="winvista-64"
+		VM_OS_TYPE="winvista-64"
 		MAXMEM="16000"
 		MAXCORES="4"
 	;;
 	windows7-64)
-		vmostype="windows7-64"
+		VM_OS_TYPE="windows7-64"
 		MAXMEM="32000"
 		MAXCORES="8"
 	;;
 	windows8-64)
-		vmostype="windows8-64"
+		VM_OS_TYPE="windows8-64"
 		MAXMEM="32000"
 		MAXCORES="8"
 	;;
 	windows9-64)
-		vmostype="windows9-64"
+		VM_OS_TYPE="windows9-64"
 		MAXMEM="64000"
 		MAXCORES="8"
 	;;
 	winvista)
-		vmostype="winvista"
+		VM_OS_TYPE="winvista"
 		MAXMEM="8000"
 		MAXCORES="2"
 	;;
 	windows7)
-		vmostype="windows7"
+		VM_OS_TYPE="windows7"
 		MAXMEM="8000"
 		MAXCORES="4"
 	;;
 	windows8)
-		vmostype="windows8"
+		VM_OS_TYPE="windows8"
 		MAXMEM="8000"
 		MAXCORES="4"
 	;;
 	windows9)
-		vmostype="windows9"
+		VM_OS_TYPE="windows9"
 		MAXMEM="8000"
 		MAXCORES="4"
 	;;
@@ -131,36 +131,36 @@ case "$vmostype" in
 		MAXCORES="1"
 	;;
 	dos|msdos*|ms-dos*)
-		vmostype="dos"
+		VM_OS_TYPE="dos"
 		shfolders="FALSE"
 		MAXMEM="128"
 		MAXCORES="1"
 	;;
 	macos*64)
-		vmostype="freebsd-64"
+		VM_OS_TYPE="freebsd-64"
 		MAXMEM="4000"
 		MAXCORES="2"
 	;;
 	macos*)
-		vmostype="freebsd"
+		VM_OS_TYPE="freebsd"
 		MAXMEM="4000"
 		MAXCORES="1"
 	;;
 	beos*)
-		vmostype="other"
+		VM_OS_TYPE="other"
 		shfolders="FALSE"
 	;;
 	# Unknown guestOS setting in .xml - this encompasses linux too,
 	# as there is a multitude of different distributions. Perhaps further
 	# action will be needed if this leads to problems with exotic OSs.
 	*64)
-		vmostype="other-64"
+		VM_OS_TYPE="other-64"
 		# shfolders="FALSE"
 		MAXMEM="123456"
 		MAXCORES="4"
 	;;
 	*)
-		vmostype="other"
+		VM_OS_TYPE="other"
 		# shfolders="FALSE"
 		MAXMEM="8000"
 		MAXCORES="1"
diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/log_config_summary.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/log_config_summary.inc
index f7f09c65..e6776882 100644
--- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/log_config_summary.inc
+++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/log_config_summary.inc
@@ -46,14 +46,13 @@ fi
 
 # image
 writelog "Diskimage:"
-writelog "\tDiskfile:\t${diskfile}"
-writelog "\tDisktype:\t${hddrv}"
-writelog "\tHWVersion:\t${hwver}"
-writelog "\tVMostype:\t${vmostype}"
+writelog "\tDiskfile:\t${VM_DISKFILE_RO}"
+writelog "\tHWVersion:\t${HWVER}"
+writelog "\tVMostype:\t${VM_OS_TYPE}"
 
 # misc
 writelog "Misc:"
-writelog "\tDisplayname:\t${displayname}"
+writelog "\tDisplayname:\t${VM_DISPLAYNAME}"
 if [ "${cap3d}" = "TRUE" -a "${enable3d}" = "TRUE" ]; then
 	writelog "\t3D Graphics:\tenabled"
 fi
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 0c45ee59..da820bc6 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
@@ -3,8 +3,6 @@
 #####################################################################
 
 set_vmware_include_variables() {
-	[ "$mem" -gt 3800 -a "$(uname -m)" != "x86_64" ] && mem=3800
-	
 	# temporary disk space for logs, etc...
 	redodir="/tmp/virt/vmware/${USER}.$$"
 	
@@ -14,9 +12,6 @@ set_vmware_include_variables() {
 	# configfile
 	conffile="${confdir}/run-vmware.conf"
 	
-	# diskfile
-	diskfile="${vmpath}"
-	
 	# users vmware config folder
 	[ -z "${HOME}" ] && HOME=$(getent passwd "$(whoami)" | awk -F ':' '{print $6}')
 	vmhome="${HOME}/.vmware"
diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/write_final_vmx.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/write_final_vmx.inc
index 41548154..e664f02f 100644
--- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/write_final_vmx.inc
+++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/write_final_vmx.inc
@@ -1,7 +1,7 @@
 
 # check for vmdk file marker %VM_DISK_PATH% and put vmdk path in it's place: also VM_DISK_MODE
 # and VM_DISK_REDOLOGDIR.
-sed -i 's#%VM_DISK_PATH%#'"$vm_diskfile"'#g' "${TMPCONFIG}"
+sed -i 's#%VM_DISK_PATH%#'"$VM_DISKFILE_RO"'#g' "${TMPCONFIG}"
 sed -i 's#%VM_DISK_MODE%#'"independent-nonpersistent"'#g' "${TMPCONFIG}"
 sed -i 's#%VM_DISK_REDOLOGDIR%#'"$redodir"'#g' "${TMPCONFIG}"
 
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 84679ebf..f66bc9b8 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
@@ -20,7 +20,7 @@
 ################################################################################
 
 VMWAREINCLUDEDIR=/opt/openslx/vmchooser/vmware/includes
-vmostype=$(rv_clean_string "$vmostype")
+VM_OS_TYPE=$(rv_clean_string "$VM_OS_TYPE")
 
 # declaration of default variables for vmware
 source "${VMWAREINCLUDEDIR}/set_vmware_include_variables.inc" && set_vmware_include_variables
-- 
cgit v1.2.3-55-g7522


From c274a008fd2a67388db1064a1ae1753018ef30d0 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 24 Oct 2016 14:01:03 +0200
Subject: [run-virt] Fix misspelled variable, extract UUID from xml again

---
 .../openslx/vmchooser/run-virt-includes/download_vm_metadata.inc    | 2 --
 .../openslx/vmchooser/run-virt-includes/get_xml_file_variables.inc  | 4 ++++
 .../opt/openslx/vmchooser/run-virt-includes/setup_image_access.inc  | 6 +++---
 .../opt/openslx/vmchooser/vmware/includes/log_config_summary.inc    | 1 -
 4 files changed, 7 insertions(+), 6 deletions(-)

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

diff --git a/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/download_vm_metadata.inc b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/download_vm_metadata.inc
index b1995d09..974a5626 100644
--- a/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/download_vm_metadata.inc
+++ b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/download_vm_metadata.inc
@@ -9,8 +9,6 @@ writelog "Detecting current/legacy mode ..."
 
 declare -rg TMPCONFIG="$TMPDIR/vmconfig.tmp"
 
-writelog "IMGUUID extracted: $IMGUUID"
-
 # Assume legacy mode by default, only trigger "current" mode if everything else below worked
 LEGACY=yes
 if [ -z "$IMGUUID" ]; then	# Keine uuid: Abbruch, Legacy
diff --git a/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/get_xml_file_variables.inc b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/get_xml_file_variables.inc
index eb699ec0..d40d97bb 100644
--- a/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/get_xml_file_variables.inc
+++ b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/get_xml_file_variables.inc
@@ -13,6 +13,8 @@ get_xml () {
 		| sed 's/&amp;/+/g;s/&quot;/"/g;s/&lt;/</g;s/&gt;/>/g'
 }
 
+IMGUUID=$(get_xml "uuid")
+
 # # Name of the virt image
 SRC_IMG_ABSOLUTE=$(get_xml "image_path")
 SRC_IMG_RELATIVE=$(get_xml "image_name")
@@ -48,12 +50,14 @@ PLUGIN_ID=$(grep -o 'virtualmachine param=.*"' "${xmlfile}" \
 # it will yield the default entries later on.
 VM_OS_TYPE=$(get_xml "os")
 
+readonly IMGUUID
 readonly SRC_IMG_ABSOLUTE SRC_IMG_RELATIVE
 readonly IMG_BASENAME
 readonly VM_DISPLAYNAME VM_NAME_CLEAN
 readonly PLUGIN_ID
 readonly VM_OS_TYPE
 
+writelog "VM UUID:                $IMGUUID"
 writelog "Virtualization plugin:  $PLUGIN_ID"
 writelog "VM name:                $VM_DISPLAYNAME"
 writelog "VM short name:          $VM_NAME_CLEAN"
diff --git a/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_image_access.inc b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_image_access.inc
index 4eb66028..4240d9ca 100644
--- a/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_image_access.inc
+++ b/remote/modules/run-virt/data/opt/openslx/vmchooser/run-virt-includes/setup_image_access.inc
@@ -76,10 +76,10 @@ if [ -z "$VM_DISKFILE_RO" ]; then
 	rid_suffix=$(ls -1 "${SRC_IMG_ABSOLUTE}.r"* | grep -E -o '\.r[0-9]+$' | grep -o -E '[0-9]+$' | sort -n | tail -n 1)
 	if [ -n "$rid_suffix" ]; then
 		# found
-		VM_DISKFILE_RO="${SRC_IMAGE_ABSOLUTE}.r${rid_suffix}"
-	elif [ -e "$SRC_IMAGE_ABSOLUTE" ]; then
+		VM_DISKFILE_RO="${SRC_IMG_ABSOLUTE}.r${rid_suffix}"
+	elif [ -e "$SRC_IMG_ABSOLUTE" ]; then
 		# try name we got from xml in the first place
-		VM_DISKFILE_RO="$SRC_IMAGE_ABSOLUTE"
+		VM_DISKFILE_RO="$SRC_IMG_ABSOLUTE"
 	fi
 fi
 
diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/log_config_summary.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/log_config_summary.inc
index e6776882..41986b2a 100644
--- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/log_config_summary.inc
+++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/log_config_summary.inc
@@ -26,7 +26,6 @@ writelog "\tMem:\t\t${mem} MB"
 
 # echo nur wenn hostmem gesetzt
 [ -n "${hostmem}" ] && writelog "\tHostmem:\t${hostmem} MB"
-writelog "\tMax. res.:\t${xres}x${yres}"
 writelog "\tCD-ROM1:\t${cdrom0}"
 writelog "\tCD-ROM2:\t${cdrom1}"
 writelog "\tFloppy_A:\t${floppy0}"
-- 
cgit v1.2.3-55-g7522