[dnbd3] Update revision

(Also minor cleanup in run_virt)

3 files changed, 53 insertions, 58 deletions

diff --git a/remote/modules/dnbd3/data/opt/openslx/scripts/systemd-setup_dnbd3 b/remote/modules/dnbd3/data/opt/openslx/scripts/systemd-setup_dnbd3
index 9c76bfa6..f424e3b9 100755
--- a/remote/modules/dnbd3/data/opt/openslx/scripts/systemd-setup_dnbd3
+++ b/remote/modules/dnbd3/data/opt/openslx/scripts/systemd-setup_dnbd3
@@ -1,9 +1,9 @@
 #!/bin/sh
 
-insmod /lib/modules/dnbd3/dnbd3.ko
+insmod /lib/modules/dnbd3/dnbd3.ko || exit 1
 [ -e "/dev/dnbd0" ] || exit 1
-for i in 0 1 2 3 4 5 6 7; do
-	echo 8192 > "/sys/block/dnbd${i}/queue/nr_requests"
+for i in /dev/dnbd*; do
+	echo 8192 > "/sys/block/dnbd${i#/dev/dnbd}/queue/nr_requests"
 done
 exec -- dnbd3-client --daemon
 
diff --git a/remote/modules/dnbd3/dnbd3.conf b/remote/modules/dnbd3/dnbd3.conf
index fdf56b8d..31966cea 100644
--- a/remote/modules/dnbd3/dnbd3.conf
+++ b/remote/modules/dnbd3/dnbd3.conf
@@ -2,7 +2,7 @@
 #REQUIRED_CONTENT_PACKAGES="libgconf-2-4 fontconfig-config"
 REQUIRED_MODULES="kernel"
 REQUIRED_GIT="git://git.openslx.org/dnbd3.git"
-REQUIRED_COMMIT="afa2df64219e6d59d76b11d70c3e98279e12f494"
+REQUIRED_COMMIT="ed82742933b694e8732fe01fc7c1c2542c027c26"
 REQUIRED_BINARIES="
 	dnbd3-client
 "
diff --git a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
index 01456c0f..d2b046ec 100755
--- a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
+++ b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
@@ -34,7 +34,7 @@
 ################################################################################
 
 # function to write to stdout and logfile
-LOGFILE=/var/log/openslx/run-virt.${USER}.$$.log
+LOGFILE="/var/log/openslx/run-virt.${USER}.$$.log"
 writelog () {
 	# write to stdout
 	echo -e "$1"
@@ -42,15 +42,28 @@ writelog () {
 	echo -e "$1" >> ${LOGFILE}
 }
 
-# remove config dirs when exit
+# Clean exit will be called at the end of this script
 cleanexit () {
-	if echo "${RMDIRS}" 2>/dev/null | grep -q ${xmlvirt}; then
+	sleep 1
+	# remove config dirs when exit
+	if echo "${RMDIRS}" 2>/dev/null | grep -q "${xmlvirt}"; then
 		writelog "${xmlvirt} exited. Cleanning up... \c"
-		rm -rf ${RMDIRS} >/dev/null 2>&1
+		rm -rf -- ${RMDIRS} >/dev/null 2>&1
 		writelog "done"
 	fi
+	# Disconnect dnbd3 device
+	if [ -n "$dnbd3" ]; then
+		for timeout in 1 1 2; do
+			dnbd3-client -d "$dnbd3" -c && break
+			writelog "dnbd3 still busy...."
+			sleep "$timeout"
+		done
+	fi
+	# Kill LPD
+	kill "$PID_LPD"
 	
 	exit "$1"
+	exit 1 # No exit code was given :/
 }
 
 # check for important files used
@@ -480,60 +493,42 @@ fi
 writelog "Used diskfile: $vm_diskfile"
 
 # Get all virtual machine specific stuff from the respective include file
-if [ -e /opt/openslx/etc/"${xmlvirt}"/run-virt.include ] ; then
-	self="${xmlvirt}"
-	. /opt/openslx/etc/"${xmlvirt}"/run-virt.include
-	# start a windowmanager for easier handling
-	# (expect problems /w windows opening in background /w vmware without wm)
-	for dm in twm xfwm4 metacity openbox blackbox kwin fvwm2 ; do
-		if which $dm >/dev/null 2>&1 ; then
-			if [ "$dm" = "fvwm2" ] ; then
-				echo "EdgeScroll 0 0" > ${redodir}/fvwm
-				fvwm2 -f ${redodir}/fvwm >/dev/null 2>&1 &
-			else
-				$dm >/dev/null 2>&1 &
-			fi
-			break
-		fi
-	done
-	# Start poolvideoswitch if we find the autostarter file
-	#if [ -e /etc/xdg/autostart/pvsgui.desktop ]; then
-	#  /usr/local/bin/pvsgui -p 2 -b >/dev/null 2>&1 &
-	#fi
-	if [[ "$DO_PROFILE" -ge "1" ]]; then
-		wget "http://132.230.8.113/profile/do.php?action=start"
-	fi
-	eval ${VIRTCMD} ${VIRTCMDOPTS}
-	writelog "Bye."
-	
-	# Postrun for commands after virtualization finishes
-	if [ -n "${POSTRUN}" ]; then
-		eval ${POSTRUN}  >/dev/null 2>&1
-	fi
-
-	# Disconnect dnbd3 device
-	if [ -n "$dnbd3" ]; then
-		for timeout in 1 1 2; do
-			dnbd3-client -c "$dnbd3" && break
-			writelog "dnbd3 still busy...."
-			sleep "$timeout"
-		done
-	fi
-	# Postrun for commands after virtualization finishes
-    if [ -n "${POSTRUN}" ]; then
-	    eval ${POSTRUN} >/dev/null 2>&1
-    fi
-
-    # Kill LPD
-    kill $PID_LPD
-
-	cleanexit 0
-else
+if [ ! -e "/opt/openslx/etc/${xmlvirt}/run-virt.include" ] ; then
 	writelog "Failed because of missing ${xmlvirt} plugin."
 	cleanexit 1
 fi
 
+self="${xmlvirt}"
+. "/opt/openslx/etc/${xmlvirt}/run-virt.include" || writelog "Erroneous run-virt.include for $xmlvirt"
+# start a windowmanager for easier handling
+# (expect problems /w windows opening in background /w vmware without wm)
+for dm in twm xfwm4 metacity openbox blackbox kwin fvwm2 ; do
+	if which $dm >/dev/null 2>&1 ; then
+		if [ "$dm" = "fvwm2" ] ; then
+			echo "EdgeScroll 0 0" > ${redodir}/fvwm
+			fvwm2 -f ${redodir}/fvwm >/dev/null 2>&1 &
+		else
+			$dm >/dev/null 2>&1 &
+		fi
+		break
+	fi
+done
+# Start poolvideoswitch if we find the autostarter file
+#if [ -e /etc/xdg/autostart/pvsgui.desktop ]; then
+#  /usr/local/bin/pvsgui -p 2 -b >/dev/null 2>&1 &
+#fi
+if [[ "$DO_PROFILE" -ge "1" ]]; then
+	wget "http://132.230.8.113/profile/do.php?action=start"
+fi
+eval ${VIRTCMD} ${VIRTCMDOPTS}
+writelog "Bye."
+
+# Postrun for commands after virtualization finishes
+if [ -n "${POSTRUN}" ]; then
+	eval ${POSTRUN}  >/dev/null 2>&1
+fi
 
 
 cleanexit 0
-exit 0
+
+