186 files changed, 167 insertions, 30 deletions
diff --git a/remote/modules/alsa/alsa.build b/remote/modules/alsa/module.build
index 4d3990b1..4d3990b1 100644
--- a/remote/modules/alsa/alsa.build
+++ b/remote/modules/alsa/module.build
diff --git a/remote/modules/alsa/alsa.conf b/remote/modules/alsa/module.conf
index 2a8be7a1..2a8be7a1 100644
--- a/remote/modules/alsa/alsa.conf
+++ b/remote/modules/alsa/module.conf
diff --git a/remote/modules/alsa/alsa.conf.debian b/remote/modules/alsa/module.conf.debian
index b1f9f0e2..b1f9f0e2 100644
--- a/remote/modules/alsa/alsa.conf.debian
+++ b/remote/modules/alsa/module.conf.debian
diff --git a/remote/modules/alsa/alsa.conf.opensuse b/remote/modules/alsa/module.conf.opensuse
index 17651c29..17651c29 100644
--- a/remote/modules/alsa/alsa.conf.opensuse
+++ b/remote/modules/alsa/module.conf.opensuse
diff --git a/remote/modules/alsa/alsa.conf.scientific b/remote/modules/alsa/module.conf.scientific
index 643e52d3..643e52d3 100644
--- a/remote/modules/alsa/alsa.conf.scientific
+++ b/remote/modules/alsa/module.conf.scientific
diff --git a/remote/modules/alsa/alsa.conf.ubuntu b/remote/modules/alsa/module.conf.ubuntu
index b1f9f0e2..b1f9f0e2 100644
--- a/remote/modules/alsa/alsa.conf.ubuntu
+++ b/remote/modules/alsa/module.conf.ubuntu
diff --git a/remote/modules/beamergui/beamergui.build b/remote/modules/beamergui/module.build
index 837a2e38..837a2e38 100644
--- a/remote/modules/beamergui/beamergui.build
+++ b/remote/modules/beamergui/module.build
diff --git a/remote/modules/beamergui/beamergui.conf b/remote/modules/beamergui/module.conf
index da786271..da786271 100644
--- a/remote/modules/beamergui/beamergui.conf
+++ b/remote/modules/beamergui/module.conf
diff --git a/remote/modules/beamergui/beamergui.conf.debian b/remote/modules/beamergui/module.conf.debian
index ea4cd194..ea4cd194 100644
--- a/remote/modules/beamergui/beamergui.conf.debian
+++ b/remote/modules/beamergui/module.conf.debian
diff --git a/remote/modules/beamergui/beamergui.conf.ubuntu b/remote/modules/beamergui/module.conf.ubuntu
index ea4cd194..ea4cd194 100644
--- a/remote/modules/beamergui/beamergui.conf.ubuntu
+++ b/remote/modules/beamergui/module.conf.ubuntu
diff --git a/remote/modules/busybox/busybox.build b/remote/modules/busybox/module.build
index 727a334c..727a334c 100644
--- a/remote/modules/busybox/busybox.build
+++ b/remote/modules/busybox/module.build
diff --git a/remote/modules/busybox/busybox.conf b/remote/modules/busybox/module.conf
index d2536ac9..d2536ac9 100644
--- a/remote/modules/busybox/busybox.conf
+++ b/remote/modules/busybox/module.conf
diff --git a/remote/modules/consolekit/consolekit.build b/remote/modules/consolekit/module.build
index 0c63ec6b..0c63ec6b 100644
--- a/remote/modules/consolekit/consolekit.build
+++ b/remote/modules/consolekit/module.build
diff --git a/remote/modules/consolekit/consolekit.conf b/remote/modules/consolekit/module.conf
index e27b15e6..e27b15e6 100644
--- a/remote/modules/consolekit/consolekit.conf
+++ b/remote/modules/consolekit/module.conf
diff --git a/remote/modules/consolekit/consolekit.conf.debian b/remote/modules/consolekit/module.conf.debian
index 0171868a..0171868a 100644
--- a/remote/modules/consolekit/consolekit.conf.debian
+++ b/remote/modules/consolekit/module.conf.debian
diff --git a/remote/modules/consolekit/consolekit.conf.opensuse b/remote/modules/consolekit/module.conf.opensuse
index d0f46410..d0f46410 100644
--- a/remote/modules/consolekit/consolekit.conf.opensuse
+++ b/remote/modules/consolekit/module.conf.opensuse
diff --git a/remote/modules/consolekit/consolekit.conf.ubuntu b/remote/modules/consolekit/module.conf.ubuntu
index e7f5e47d..e7f5e47d 100644
--- a/remote/modules/consolekit/consolekit.conf.ubuntu
+++ b/remote/modules/consolekit/module.conf.ubuntu
diff --git a/remote/modules/cron/cron.build b/remote/modules/cron/module.build
index 932c3e85..932c3e85 100644
--- a/remote/modules/cron/cron.build
+++ b/remote/modules/cron/module.build
diff --git a/remote/modules/cron/cron.conf b/remote/modules/cron/module.conf
index 8ecca658..8ecca658 100644
--- a/remote/modules/cron/cron.conf
+++ b/remote/modules/cron/module.conf
diff --git a/remote/modules/cups/cups.build b/remote/modules/cups/module.build
index 0238f1bd..0238f1bd 100644
--- a/remote/modules/cups/cups.build
+++ b/remote/modules/cups/module.build
diff --git a/remote/modules/cups/cups.conf b/remote/modules/cups/module.conf
index 586e0d12..586e0d12 100644
--- a/remote/modules/cups/cups.conf
+++ b/remote/modules/cups/module.conf
diff --git a/remote/modules/cups/cups.conf.opensuse b/remote/modules/cups/module.conf.opensuse
index d13021ba..d13021ba 100644
--- a/remote/modules/cups/cups.conf.opensuse
+++ b/remote/modules/cups/module.conf.opensuse
diff --git a/remote/modules/cups/cups.conf.ubuntu b/remote/modules/cups/module.conf.ubuntu
index 8ca1d1c6..8ca1d1c6 100644
--- a/remote/modules/cups/cups.conf.ubuntu
+++ b/remote/modules/cups/module.conf.ubuntu
diff --git a/remote/modules/cups/cups.conf.ubuntu.13 b/remote/modules/cups/module.conf.ubuntu.13
index 53c8d62d..53c8d62d 100644
--- a/remote/modules/cups/cups.conf.ubuntu.13
+++ b/remote/modules/cups/module.conf.ubuntu.13
diff --git a/remote/modules/cups/cups.conf.ubuntu.13.10 b/remote/modules/cups/module.conf.ubuntu.13.10
index d3fa3b5d..d3fa3b5d 100644
--- a/remote/modules/cups/cups.conf.ubuntu.13.10
+++ b/remote/modules/cups/module.conf.ubuntu.13.10
diff --git a/remote/modules/dbus/dbus.build b/remote/modules/dbus/module.build
index c5b2d353..c5b2d353 100644
--- a/remote/modules/dbus/dbus.build
+++ b/remote/modules/dbus/module.build
diff --git a/remote/modules/dbus/dbus.conf b/remote/modules/dbus/module.conf
index 40f8a53d..40f8a53d 100644
--- a/remote/modules/dbus/dbus.conf
+++ b/remote/modules/dbus/module.conf
diff --git a/remote/modules/dbus/dbus.conf.debian b/remote/modules/dbus/module.conf.debian
index d007c2ef..d007c2ef 100644
--- a/remote/modules/dbus/dbus.conf.debian
+++ b/remote/modules/dbus/module.conf.debian
diff --git a/remote/modules/dbus/dbus.conf.opensuse b/remote/modules/dbus/module.conf.opensuse
index 9bc514e2..9bc514e2 100644
--- a/remote/modules/dbus/dbus.conf.opensuse
+++ b/remote/modules/dbus/module.conf.opensuse
diff --git a/remote/modules/dbus/dbus.conf.ubuntu b/remote/modules/dbus/module.conf.ubuntu
index 558eea7f..558eea7f 100644
--- a/remote/modules/dbus/dbus.conf.ubuntu
+++ b/remote/modules/dbus/module.conf.ubuntu
diff --git a/remote/modules/debug/debug.build b/remote/modules/debug/module.build
index c020181d..c020181d 100644
--- a/remote/modules/debug/debug.build
+++ b/remote/modules/debug/module.build
diff --git a/remote/modules/debug/debug.conf b/remote/modules/debug/module.conf
index 71006514..71006514 100644
--- a/remote/modules/debug/debug.conf
+++ b/remote/modules/debug/module.conf
diff --git a/remote/modules/debug/debug.conf.debian b/remote/modules/debug/module.conf.debian
index 00bfea2c..00bfea2c 100644
--- a/remote/modules/debug/debug.conf.debian
+++ b/remote/modules/debug/module.conf.debian
diff --git a/remote/modules/debug/debug.conf.opensuse b/remote/modules/debug/module.conf.opensuse
index b7971956..b7971956 100644
--- a/remote/modules/debug/debug.conf.opensuse
+++ b/remote/modules/debug/module.conf.opensuse
diff --git a/remote/modules/debug/debug.conf.ubuntu b/remote/modules/debug/module.conf.ubuntu
index 00bfea2c..00bfea2c 100644
--- a/remote/modules/debug/debug.conf.ubuntu
+++ b/remote/modules/debug/module.conf.ubuntu
diff --git a/remote/modules/dhcpc-busybox/dhcpc-busybox.build b/remote/modules/dhcpc-busybox/module.build
index d8804784..d8804784 100644
--- a/remote/modules/dhcpc-busybox/dhcpc-busybox.build
+++ b/remote/modules/dhcpc-busybox/module.build
diff --git a/remote/modules/dhcpc-busybox/dhcpc-busybox.conf b/remote/modules/dhcpc-busybox/module.conf
index c01ade29..c01ade29 100644
--- a/remote/modules/dhcpc-busybox/dhcpc-busybox.conf
+++ b/remote/modules/dhcpc-busybox/module.conf
diff --git a/remote/modules/dnbd3/dnbd3.build b/remote/modules/dnbd3/module.build
index 2651daac..2651daac 100644
--- a/remote/modules/dnbd3/dnbd3.build
+++ b/remote/modules/dnbd3/module.build
diff --git a/remote/modules/dnbd3/dnbd3.conf b/remote/modules/dnbd3/module.conf
index 333637fd..333637fd 100644
--- a/remote/modules/dnbd3/dnbd3.conf
+++ b/remote/modules/dnbd3/module.conf
diff --git a/remote/modules/dnbd3/dnbd3.conf.debian b/remote/modules/dnbd3/module.conf.debian
index c26fd833..c26fd833 100644
--- a/remote/modules/dnbd3/dnbd3.conf.debian
+++ b/remote/modules/dnbd3/module.conf.debian
diff --git a/remote/modules/dnbd3/dnbd3.conf.opensuse b/remote/modules/dnbd3/module.conf.opensuse
index 713ad2b1..713ad2b1 100644
--- a/remote/modules/dnbd3/dnbd3.conf.opensuse
+++ b/remote/modules/dnbd3/module.conf.opensuse
diff --git a/remote/modules/dnbd3/dnbd3.conf.ubuntu b/remote/modules/dnbd3/module.conf.ubuntu
index d303245c..d303245c 100644
--- a/remote/modules/dnbd3/dnbd3.conf.ubuntu
+++ b/remote/modules/dnbd3/module.conf.ubuntu
diff --git a/remote/modules/german/german.build b/remote/modules/german/module.build
index cd68f009..cd68f009 100644
--- a/remote/modules/german/german.build
+++ b/remote/modules/german/module.build
diff --git a/remote/modules/german/german.conf b/remote/modules/german/module.conf
index e2f82123..e2f82123 100644
--- a/remote/modules/german/german.conf
+++ b/remote/modules/german/module.conf
diff --git a/remote/modules/german/german.conf.debian b/remote/modules/german/module.conf.debian
index a43faea2..a43faea2 100644
--- a/remote/modules/german/german.conf.debian
+++ b/remote/modules/german/module.conf.debian
diff --git a/remote/modules/german/german.conf.opensuse b/remote/modules/german/module.conf.opensuse
index 2bb901ff..2bb901ff 100644
--- a/remote/modules/german/german.conf.opensuse
+++ b/remote/modules/german/module.conf.opensuse
diff --git a/remote/modules/german/german.conf.scientific b/remote/modules/german/module.conf.scientific
index 88ac0d27..88ac0d27 100644
--- a/remote/modules/german/german.conf.scientific
+++ b/remote/modules/german/module.conf.scientific
diff --git a/remote/modules/german/german.conf.ubuntu b/remote/modules/german/module.conf.ubuntu
index aee3c64b..aee3c64b 100644
--- a/remote/modules/german/german.conf.ubuntu
+++ b/remote/modules/german/module.conf.ubuntu
diff --git a/remote/modules/idleaction/data/opt/openslx/scripts/idleaction-cron_script b/remote/modules/idleaction/data/opt/openslx/scripts/idleaction-cron_script
index 746f2f47..b68c27f8 100755
--- a/remote/modules/idleaction/data/opt/openslx/scripts/idleaction-cron_script
+++ b/remote/modules/idleaction/data/opt/openslx/scripts/idleaction-cron_script
@@ -39,6 +39,8 @@ if [ -n "${SLX_LOGOUT_TIMEOUT}" ]; then
 					else
 						loginctl terminate-session "$ses"
 					fi
+				else # xprintidle did not work
+					IS_IDLE=no
 				fi
 				continue # Done with this session, skip normal tty/ssh checks
 			fi
@@ -103,7 +105,7 @@ invalid_time ()
 	return 0
 }
 
-if [ -n "$SLX_SHUTDOWN_SCHEDULE" ] && [ ! -e "$CRONFILE" ]; then
+if [ -n "$SLX_SHUTDOWN_SCHEDULE" -o -n "$SLX_REBOOT_SCHEDULE" ] && [ ! -e "$CRONFILE" ]; then
 	echo "# OpenSLX: Trigger poweroff at certain time of day" > "$CRONFILE"
 	echo "SHELL=/bin/ash" >> "$CRONFILE"
 	echo "PATH=/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/usr/sbin:/opt/openslx/usr/bin:/opt/openslx/sbin:/opt/openslx/bin" >> "$CRONFILE"
@@ -116,5 +118,14 @@ if [ -n "$SLX_SHUTDOWN_SCHEDULE" ] && [ ! -e "$CRONFILE" ]; then
 		[ "$MINUTE" -lt 0 -o "$MINUTE" -gt 59 ] && invalid_time && continue
 		echo "$MINUTE $HOUR	* * *	root	/opt/openslx/scripts/idleaction-scheduled_poweroff" >> "$CRONFILE"
 	done
+	# do it again for SLX_REBOOT_SCHEDULE
+	for time in $SLX_REBOOT_SCHEDULE; do
+		HOUR=${time%%:*}
+		MINUTE=${time##*:}
+		[ -z "$HOUR$MINUTE" ] && invalid_time && continue
+		[ "$HOUR" -lt 0 -o "$HOUR" -gt 23 ] && invalid_time && continue
+		[ "$MINUTE" -lt 0 -o "$MINUTE" -gt 59 ] && invalid_time && continue
+		echo "$MINUTE $HOUR	* * *	root	/opt/openslx/scripts/idleaction-scheduled_reboot" >> "$CRONFILE"
+	done
 fi
 
diff --git a/remote/modules/idleaction/data/opt/openslx/scripts/idleaction-scheduled_reboot b/remote/modules/idleaction/data/opt/openslx/scripts/idleaction-scheduled_reboot
new file mode 100755
index 00000000..fa3adf65
--- /dev/null
+++ b/remote/modules/idleaction/data/opt/openslx/scripts/idleaction-scheduled_reboot
@@ -0,0 +1,6 @@
+#!/bin/ash
+
+# TODO: Warn user, wait 5 minutes, etc...
+
+echo 'b' > /proc/sysrq-trigger
+
diff --git a/remote/modules/idleaction/idleaction.build b/remote/modules/idleaction/module.build
index 1b740aa1..1b740aa1 100644
--- a/remote/modules/idleaction/idleaction.build
+++ b/remote/modules/idleaction/module.build
diff --git a/remote/modules/idleaction/idleaction.conf b/remote/modules/idleaction/module.conf
index 1661735b..1661735b 100644
--- a/remote/modules/idleaction/idleaction.conf
+++ b/remote/modules/idleaction/module.conf
diff --git a/remote/modules/idleaction/idleaction.conf.opensuse b/remote/modules/idleaction/module.conf.opensuse
index d368cbd8..d368cbd8 100644
--- a/remote/modules/idleaction/idleaction.conf.opensuse
+++ b/remote/modules/idleaction/module.conf.opensuse
diff --git a/remote/modules/idleaction/idleaction.conf.ubuntu b/remote/modules/idleaction/module.conf.ubuntu
index 0dad2e48..0dad2e48 100644
--- a/remote/modules/idleaction/idleaction.conf.ubuntu
+++ b/remote/modules/idleaction/module.conf.ubuntu
diff --git a/remote/modules/iptables-helper/iptables-helper.build b/remote/modules/iptables-helper/module.build
index d8804784..d8804784 100644
--- a/remote/modules/iptables-helper/iptables-helper.build
+++ b/remote/modules/iptables-helper/module.build
diff --git a/remote/modules/iptables-helper/iptables-helper.conf b/remote/modules/iptables-helper/module.conf
index 34103f5b..34103f5b 100644
--- a/remote/modules/iptables-helper/iptables-helper.conf
+++ b/remote/modules/iptables-helper/module.conf
diff --git a/remote/modules/kdm-theme-bwlp/kdm-theme-bwlp.build b/remote/modules/kdm-theme-bwlp/module.build
index ccb7c4e1..ccb7c4e1 100644
--- a/remote/modules/kdm-theme-bwlp/kdm-theme-bwlp.build
+++ b/remote/modules/kdm-theme-bwlp/module.build
diff --git a/remote/modules/kdm-theme-bwlp/kdm-theme-bwlp.conf b/remote/modules/kdm-theme-bwlp/module.conf
index 04a7b61d..04a7b61d 100644
--- a/remote/modules/kdm-theme-bwlp/kdm-theme-bwlp.conf
+++ b/remote/modules/kdm-theme-bwlp/module.conf
diff --git a/remote/modules/kdm/kdm.build b/remote/modules/kdm/module.build
index d5199340..d5199340 100644
--- a/remote/modules/kdm/kdm.build
+++ b/remote/modules/kdm/module.build
diff --git a/remote/modules/kdm/kdm.conf b/remote/modules/kdm/module.conf
index 2778a2bc..2778a2bc 100644
--- a/remote/modules/kdm/kdm.conf
+++ b/remote/modules/kdm/module.conf
diff --git a/remote/modules/kdm/kdm.conf.debian b/remote/modules/kdm/module.conf.debian
index da0df913..da0df913 100644
--- a/remote/modules/kdm/kdm.conf.debian
+++ b/remote/modules/kdm/module.conf.debian
diff --git a/remote/modules/kdm/kdm.conf.opensuse b/remote/modules/kdm/module.conf.opensuse
index 832baf9c..832baf9c 100644
--- a/remote/modules/kdm/kdm.conf.opensuse
+++ b/remote/modules/kdm/module.conf.opensuse
diff --git a/remote/modules/kdm/kdm.conf.scientific b/remote/modules/kdm/module.conf.scientific
index d61cc8d6..d61cc8d6 100644
--- a/remote/modules/kdm/kdm.conf.scientific
+++ b/remote/modules/kdm/module.conf.scientific
diff --git a/remote/modules/kdm/kdm.conf.ubuntu b/remote/modules/kdm/module.conf.ubuntu
index b91d00e0..b91d00e0 100644
--- a/remote/modules/kdm/kdm.conf.ubuntu
+++ b/remote/modules/kdm/module.conf.ubuntu
diff --git a/remote/modules/kernel-system/kernel-system.build b/remote/modules/kernel-system/module.build
index d542a80d..d542a80d 100644
--- a/remote/modules/kernel-system/kernel-system.build
+++ b/remote/modules/kernel-system/module.build
diff --git a/remote/modules/kernel-system/kernel-system.conf b/remote/modules/kernel-system/module.conf
index 0cd03752..0cd03752 100644
--- a/remote/modules/kernel-system/kernel-system.conf
+++ b/remote/modules/kernel-system/module.conf
diff --git a/remote/modules/kernel-system/kernel-system.conf.opensuse b/remote/modules/kernel-system/module.conf.opensuse
index 6bfc2078..6bfc2078 100644
--- a/remote/modules/kernel-system/kernel-system.conf.opensuse
+++ b/remote/modules/kernel-system/module.conf.opensuse
diff --git a/remote/modules/kernel-system/kernel-system.conf.ubuntu b/remote/modules/kernel-system/module.conf.ubuntu
index 4d47b243..4d47b243 100644
--- a/remote/modules/kernel-system/kernel-system.conf.ubuntu
+++ b/remote/modules/kernel-system/module.conf.ubuntu
diff --git a/remote/modules/kernel/kernel.build b/remote/modules/kernel/module.build
index f74403f1..fdc7e9ff 100644
--- a/remote/modules/kernel/kernel.build
+++ b/remote/modules/kernel/module.build
@@ -9,10 +9,6 @@ get_kernel_version() {
 		# declare path to kernel headers and modules/firmware
 		declare -rg KERNEL_HEADERS_PATH="$MODULES_DIR/kernel/ksrc"
 		declare -rg KERNEL_BASE_DIR="$MODULES_DIR/kernel/build"
-		
-	else
-		# TODO handle
-		perror "'$MODULES_DIR/kernel/ksrc/include/generated/utsrelease.h' does not exist yes."
 	fi
 
 	# print debug info
diff --git a/remote/modules/kernel/kernel.conf b/remote/modules/kernel/module.conf
index 0cd03752..0cd03752 100644
--- a/remote/modules/kernel/kernel.conf
+++ b/remote/modules/kernel/module.conf
diff --git a/remote/modules/kernel/kernel.conf.opensuse b/remote/modules/kernel/module.conf.opensuse
index a66564fe..a66564fe 100644
--- a/remote/modules/kernel/kernel.conf.opensuse
+++ b/remote/modules/kernel/module.conf.opensuse
diff --git a/remote/modules/kernel/kernel.conf.ubuntu b/remote/modules/kernel/module.conf.ubuntu
index 1c876d15..1c876d15 100644
--- a/remote/modules/kernel/kernel.conf.ubuntu
+++ b/remote/modules/kernel/module.conf.ubuntu
diff --git a/remote/modules/kernel/kernel.conf.ubuntu.13.04 b/remote/modules/kernel/module.conf.ubuntu.13.04
index e9192f01..e9192f01 100644
--- a/remote/modules/kernel/kernel.conf.ubuntu.13.04
+++ b/remote/modules/kernel/module.conf.ubuntu.13.04
diff --git a/remote/modules/ldm-gtk-greeter/ldm-gtk-greeter.build b/remote/modules/ldm-gtk-greeter/module.build
index 27e5a592..27e5a592 100644
--- a/remote/modules/ldm-gtk-greeter/ldm-gtk-greeter.build
+++ b/remote/modules/ldm-gtk-greeter/module.build
diff --git a/remote/modules/ldm-gtk-greeter/ldm-gtk-greeter.conf b/remote/modules/ldm-gtk-greeter/module.conf
index e9349002..e9349002 100644
--- a/remote/modules/ldm-gtk-greeter/ldm-gtk-greeter.conf
+++ b/remote/modules/ldm-gtk-greeter/module.conf
diff --git a/remote/modules/ldm/ldm.build b/remote/modules/ldm/module.build
index e88f0b08..e88f0b08 100644
--- a/remote/modules/ldm/ldm.build
+++ b/remote/modules/ldm/module.build
diff --git a/remote/modules/ldm/ldm.conf b/remote/modules/ldm/module.conf
index 74ab9450..74ab9450 100644
--- a/remote/modules/ldm/ldm.conf
+++ b/remote/modules/ldm/module.conf
diff --git a/remote/modules/nscd/nscd.build b/remote/modules/nscd/module.build
index bd189b66..bd189b66 100644
--- a/remote/modules/nscd/nscd.build
+++ b/remote/modules/nscd/module.build
diff --git a/remote/modules/nscd/nscd.conf b/remote/modules/nscd/module.conf
index 74af4cfb..74af4cfb 100644
--- a/remote/modules/nscd/nscd.conf
+++ b/remote/modules/nscd/module.conf
diff --git a/remote/modules/nscd/nscd.conf.debian b/remote/modules/nscd/module.conf.debian
index 4a61cc19..4a61cc19 100644
--- a/remote/modules/nscd/nscd.conf.debian
+++ b/remote/modules/nscd/module.conf.debian
diff --git a/remote/modules/nscd/nscd.conf.opensuse b/remote/modules/nscd/module.conf.opensuse
index 4a61cc19..4a61cc19 100644
--- a/remote/modules/nscd/nscd.conf.opensuse
+++ b/remote/modules/nscd/module.conf.opensuse
diff --git a/remote/modules/nscd/nscd.conf.ubuntu b/remote/modules/nscd/module.conf.ubuntu
index 4a61cc19..4a61cc19 100644
--- a/remote/modules/nscd/nscd.conf.ubuntu
+++ b/remote/modules/nscd/module.conf.ubuntu
diff --git a/remote/modules/nvidia_kernel/nvidia_kernel.build b/remote/modules/nvidia_kernel/module.build
index a1275c70..a1275c70 100644
--- a/remote/modules/nvidia_kernel/nvidia_kernel.build
+++ b/remote/modules/nvidia_kernel/module.build
diff --git a/remote/modules/nvidia_kernel/nvidia_kernel.conf b/remote/modules/nvidia_kernel/module.conf
index 9880100d..9880100d 100644
--- a/remote/modules/nvidia_kernel/nvidia_kernel.conf
+++ b/remote/modules/nvidia_kernel/module.conf
diff --git a/remote/modules/nvidia_libs/nvidia_libs.build b/remote/modules/nvidia_libs/module.build
index 38f60d09..38f60d09 100644
--- a/remote/modules/nvidia_libs/nvidia_libs.build
+++ b/remote/modules/nvidia_libs/module.build
diff --git a/remote/modules/nvidia_libs/nvidia_libs.conf b/remote/modules/nvidia_libs/module.conf
index 12748274..12748274 100644
--- a/remote/modules/nvidia_libs/nvidia_libs.conf
+++ b/remote/modules/nvidia_libs/module.conf
diff --git a/remote/modules/nvidia_libs/nvidia_libs.conf.ubuntu b/remote/modules/nvidia_libs/module.conf.ubuntu
index a3a80bee..a3a80bee 100644
--- a/remote/modules/nvidia_libs/nvidia_libs.conf.ubuntu
+++ b/remote/modules/nvidia_libs/module.conf.ubuntu
diff --git a/remote/modules/openbox/openbox.build b/remote/modules/openbox/module.build
index 0cd6aaad..0cd6aaad 100644
--- a/remote/modules/openbox/openbox.build
+++ b/remote/modules/openbox/module.build
diff --git a/remote/modules/openbox/openbox.conf b/remote/modules/openbox/module.conf
index 8a816b97..8a816b97 100644
--- a/remote/modules/openbox/openbox.conf
+++ b/remote/modules/openbox/module.conf
diff --git a/remote/modules/openbox/openbox.conf.debian b/remote/modules/openbox/module.conf.debian
index b10bd40d..b10bd40d 100644
--- a/remote/modules/openbox/openbox.conf.debian
+++ b/remote/modules/openbox/module.conf.debian
diff --git a/remote/modules/openbox/openbox.conf.opensuse b/remote/modules/openbox/module.conf.opensuse
index c06a89b2..c06a89b2 100644
--- a/remote/modules/openbox/openbox.conf.opensuse
+++ b/remote/modules/openbox/module.conf.opensuse
diff --git a/remote/modules/openbox/openbox.conf.ubuntu b/remote/modules/openbox/module.conf.ubuntu
index b10bd40d..b10bd40d 100644
--- a/remote/modules/openbox/openbox.conf.ubuntu
+++ b/remote/modules/openbox/module.conf.ubuntu
diff --git a/remote/modules/openbox/openbox.conf.zypper b/remote/modules/openbox/module.conf.zypper
index 1d0b68c5..1d0b68c5 100644
--- a/remote/modules/openbox/openbox.conf.zypper
+++ b/remote/modules/openbox/module.conf.zypper
diff --git a/remote/modules/pam/pam.build b/remote/modules/pam/module.build
index 15828fb8..15828fb8 100644
--- a/remote/modules/pam/pam.build
+++ b/remote/modules/pam/module.build
diff --git a/remote/modules/pam/pam.conf b/remote/modules/pam/module.conf
index c0a21a79..c0a21a79 100644
--- a/remote/modules/pam/pam.conf
+++ b/remote/modules/pam/module.conf
diff --git a/remote/modules/pam/pam.conf.debian b/remote/modules/pam/module.conf.debian
index d424f1f7..d424f1f7 100644
--- a/remote/modules/pam/pam.conf.debian
+++ b/remote/modules/pam/module.conf.debian
diff --git a/remote/modules/pam/pam.conf.opensuse b/remote/modules/pam/module.conf.opensuse
index adef3174..adef3174 100644
--- a/remote/modules/pam/pam.conf.opensuse
+++ b/remote/modules/pam/module.conf.opensuse
diff --git a/remote/modules/pam/pam.conf.opensuse.13.1 b/remote/modules/pam/module.conf.opensuse.13.1
index 9fe1de17..9fe1de17 100644
--- a/remote/modules/pam/pam.conf.opensuse.13.1
+++ b/remote/modules/pam/module.conf.opensuse.13.1
diff --git a/remote/modules/pam/pam.conf.ubuntu b/remote/modules/pam/module.conf.ubuntu
index 31023197..31023197 100644
--- a/remote/modules/pam/pam.conf.ubuntu
+++ b/remote/modules/pam/module.conf.ubuntu
diff --git a/remote/modules/plymouth/plymouth.build b/remote/modules/plymouth/module.build
index 67b7734e..67b7734e 100644
--- a/remote/modules/plymouth/plymouth.build
+++ b/remote/modules/plymouth/module.build
diff --git a/remote/modules/plymouth/plymouth.conf b/remote/modules/plymouth/module.conf
index d8827529..d8827529 100644
--- a/remote/modules/plymouth/plymouth.conf
+++ b/remote/modules/plymouth/module.conf
diff --git a/remote/modules/plymouth/plymouth.conf.debian b/remote/modules/plymouth/module.conf.debian
index 0c6e00a4..0c6e00a4 100644
--- a/remote/modules/plymouth/plymouth.conf.debian
+++ b/remote/modules/plymouth/module.conf.debian
diff --git a/remote/modules/plymouth/plymouth.conf.opensuse b/remote/modules/plymouth/module.conf.opensuse
index 034af2ad..034af2ad 100644
--- a/remote/modules/plymouth/plymouth.conf.opensuse
+++ b/remote/modules/plymouth/module.conf.opensuse
diff --git a/remote/modules/plymouth/plymouth.conf.ubuntu b/remote/modules/plymouth/module.conf.ubuntu
index 0c6e00a4..0c6e00a4 100644
--- a/remote/modules/plymouth/plymouth.conf.ubuntu
+++ b/remote/modules/plymouth/module.conf.ubuntu
diff --git a/remote/modules/polkit/polkit.build b/remote/modules/polkit/module.build
index 10203209..10203209 100644
--- a/remote/modules/polkit/polkit.build
+++ b/remote/modules/polkit/module.build
diff --git a/remote/modules/polkit/polkit.conf b/remote/modules/polkit/module.conf
index 97d4b892..97d4b892 100644
--- a/remote/modules/polkit/polkit.conf
+++ b/remote/modules/polkit/module.conf
diff --git a/remote/modules/polkit/polkit.conf.debian b/remote/modules/polkit/module.conf.debian
index 5684a504..5684a504 100644
--- a/remote/modules/polkit/polkit.conf.debian
+++ b/remote/modules/polkit/module.conf.debian
diff --git a/remote/modules/polkit/polkit.conf.opensuse b/remote/modules/polkit/module.conf.opensuse
index e7c1f369..e7c1f369 100644
--- a/remote/modules/polkit/polkit.conf.opensuse
+++ b/remote/modules/polkit/module.conf.opensuse
diff --git a/remote/modules/polkit/polkit.conf.ubuntu b/remote/modules/polkit/module.conf.ubuntu
index eb2f88d1..eb2f88d1 100644
--- a/remote/modules/polkit/polkit.conf.ubuntu
+++ b/remote/modules/polkit/module.conf.ubuntu
diff --git a/remote/modules/printergui/printergui.build b/remote/modules/printergui/module.build
index 2ee49154..2ee49154 100644
--- a/remote/modules/printergui/printergui.build
+++ b/remote/modules/printergui/module.build
diff --git a/remote/modules/printergui/printergui.conf b/remote/modules/printergui/module.conf
index 17203d3e..17203d3e 100644
--- a/remote/modules/printergui/printergui.conf
+++ b/remote/modules/printergui/module.conf
diff --git a/remote/modules/printergui/printergui.conf.opensuse b/remote/modules/printergui/module.conf.opensuse
index 2d4c7a95..2d4c7a95 100644
--- a/remote/modules/printergui/printergui.conf.opensuse
+++ b/remote/modules/printergui/module.conf.opensuse
diff --git a/remote/modules/printergui/printergui.conf.ubuntu b/remote/modules/printergui/module.conf.ubuntu
index 2f679912..2f679912 100644
--- a/remote/modules/printergui/printergui.conf.ubuntu
+++ b/remote/modules/printergui/module.conf.ubuntu
diff --git a/remote/modules/qemukvm/qemukvm.build b/remote/modules/qemukvm/module.build
index 6d8ad7be..6d8ad7be 100644
--- a/remote/modules/qemukvm/qemukvm.build
+++ b/remote/modules/qemukvm/module.build
diff --git a/remote/modules/qemukvm/qemukvm.conf b/remote/modules/qemukvm/module.conf
index 32df73a5..32df73a5 100644
--- a/remote/modules/qemukvm/qemukvm.conf
+++ b/remote/modules/qemukvm/module.conf
diff --git a/remote/modules/qemukvm/qemukvm.conf.ubuntu b/remote/modules/qemukvm/module.conf.ubuntu
index d0fdc5f3..d0fdc5f3 100644
--- a/remote/modules/qemukvm/qemukvm.conf.ubuntu
+++ b/remote/modules/qemukvm/module.conf.ubuntu
diff --git a/remote/modules/redsocks/redsocks.build b/remote/modules/redsocks/module.build
index f6a05350..f6a05350 100644
--- a/remote/modules/redsocks/redsocks.build
+++ b/remote/modules/redsocks/module.build
diff --git a/remote/modules/redsocks/redsocks.conf b/remote/modules/redsocks/module.conf
index 62c15c70..62c15c70 100644
--- a/remote/modules/redsocks/redsocks.conf
+++ b/remote/modules/redsocks/module.conf
diff --git a/remote/modules/redsocks/redsocks.conf.debian b/remote/modules/redsocks/module.conf.debian
index da41b04e..da41b04e 100644
--- a/remote/modules/redsocks/redsocks.conf.debian
+++ b/remote/modules/redsocks/module.conf.debian
diff --git a/remote/modules/redsocks/redsocks.conf.opensuse b/remote/modules/redsocks/module.conf.opensuse
index fcc0fb45..fcc0fb45 100644
--- a/remote/modules/redsocks/redsocks.conf.opensuse
+++ b/remote/modules/redsocks/module.conf.opensuse
diff --git a/remote/modules/redsocks/redsocks.conf.ubuntu b/remote/modules/redsocks/module.conf.ubuntu
index da41b04e..da41b04e 100644
--- a/remote/modules/redsocks/redsocks.conf.ubuntu
+++ b/remote/modules/redsocks/module.conf.ubuntu
diff --git a/remote/modules/rsyslogd/rsyslogd.build b/remote/modules/rsyslogd/module.build
index c35d07b7..c35d07b7 100644
--- a/remote/modules/rsyslogd/rsyslogd.build
+++ b/remote/modules/rsyslogd/module.build
diff --git a/remote/modules/rsyslogd/rsyslogd.conf b/remote/modules/rsyslogd/module.conf
index ba36aadf..ba36aadf 100644
--- a/remote/modules/rsyslogd/rsyslogd.conf
+++ b/remote/modules/rsyslogd/module.conf
diff --git a/remote/modules/rsyslogd/rsyslogd.conf.debian b/remote/modules/rsyslogd/module.conf.debian
index 79aba761..79aba761 100644
--- a/remote/modules/rsyslogd/rsyslogd.conf.debian
+++ b/remote/modules/rsyslogd/module.conf.debian
diff --git a/remote/modules/rsyslogd/rsyslogd.conf.opensuse b/remote/modules/rsyslogd/module.conf.opensuse
index 51ce0e47..51ce0e47 100644
--- a/remote/modules/rsyslogd/rsyslogd.conf.opensuse
+++ b/remote/modules/rsyslogd/module.conf.opensuse
diff --git a/remote/modules/rsyslogd/rsyslogd.conf.ubuntu b/remote/modules/rsyslogd/module.conf.ubuntu
index 79aba761..79aba761 100644
--- a/remote/modules/rsyslogd/rsyslogd.conf.ubuntu
+++ b/remote/modules/rsyslogd/module.conf.ubuntu
diff --git a/remote/modules/samba/samba.build b/remote/modules/samba/module.build
index a0a60831..a0a60831 100644
--- a/remote/modules/samba/samba.build
+++ b/remote/modules/samba/module.build
diff --git a/remote/modules/samba/samba.conf b/remote/modules/samba/module.conf
index 00063187..00063187 100644
--- a/remote/modules/samba/samba.conf
+++ b/remote/modules/samba/module.conf
diff --git a/remote/modules/samba/samba.conf.opensuse b/remote/modules/samba/module.conf.opensuse
index fd06e50a..fd06e50a 100644
--- a/remote/modules/samba/samba.conf.opensuse
+++ b/remote/modules/samba/module.conf.opensuse
diff --git a/remote/modules/samba/samba.conf.ubuntu b/remote/modules/samba/module.conf.ubuntu
index 20bb46ba..20bb46ba 100644
--- a/remote/modules/samba/samba.conf.ubuntu
+++ b/remote/modules/samba/module.conf.ubuntu
diff --git a/remote/modules/smartctl/smartctl.build b/remote/modules/smartctl/module.build
index 435a7b10..435a7b10 100644
--- a/remote/modules/smartctl/smartctl.build
+++ b/remote/modules/smartctl/module.build
diff --git a/remote/modules/smartctl/smartctl.conf b/remote/modules/smartctl/module.conf
index 9ea1ed03..9ea1ed03 100644
--- a/remote/modules/smartctl/smartctl.conf
+++ b/remote/modules/smartctl/module.conf
diff --git a/remote/modules/smartctl/smartctl.conf.opensuse b/remote/modules/smartctl/module.conf.opensuse
index d699f2f0..d699f2f0 100644
--- a/remote/modules/smartctl/smartctl.conf.opensuse
+++ b/remote/modules/smartctl/module.conf.opensuse
diff --git a/remote/modules/smartctl/smartctl.conf.ubuntu b/remote/modules/smartctl/module.conf.ubuntu
index d699f2f0..d699f2f0 100644
--- a/remote/modules/smartctl/smartctl.conf.ubuntu
+++ b/remote/modules/smartctl/module.conf.ubuntu
diff --git a/remote/modules/smbclient/smbclient.build b/remote/modules/smbclient/module.build
index dc28dd26..dc28dd26 100644
--- a/remote/modules/smbclient/smbclient.build
+++ b/remote/modules/smbclient/module.build
diff --git a/remote/modules/smbclient/smbclient.conf b/remote/modules/smbclient/module.conf
index 460c57b5..460c57b5 100644
--- a/remote/modules/smbclient/smbclient.conf
+++ b/remote/modules/smbclient/module.conf
diff --git a/remote/modules/smbclient/smbclient.conf.opensuse b/remote/modules/smbclient/module.conf.opensuse
index f524d100..f524d100 100644
--- a/remote/modules/smbclient/smbclient.conf.opensuse
+++ b/remote/modules/smbclient/module.conf.opensuse
diff --git a/remote/modules/smbclient/smbclient.conf.ubuntu b/remote/modules/smbclient/module.conf.ubuntu
index 4b33f4bd..4b33f4bd 100644
--- a/remote/modules/smbclient/smbclient.conf.ubuntu
+++ b/remote/modules/smbclient/module.conf.ubuntu
diff --git a/remote/modules/splash-openslx/splash-openslx.build b/remote/modules/splash-openslx/module.build
index ccb7c4e1..ccb7c4e1 100644
--- a/remote/modules/splash-openslx/splash-openslx.build
+++ b/remote/modules/splash-openslx/module.build
diff --git a/remote/modules/splash-openslx/splash-openslx.conf b/remote/modules/splash-openslx/module.conf
index 6778a258..6778a258 100644
--- a/remote/modules/splash-openslx/splash-openslx.conf
+++ b/remote/modules/splash-openslx/module.conf
diff --git a/remote/modules/sshd/sshd.build b/remote/modules/sshd/module.build
index ebf42c12..ebf42c12 100644
--- a/remote/modules/sshd/sshd.build
+++ b/remote/modules/sshd/module.build
diff --git a/remote/modules/sshd/sshd.conf b/remote/modules/sshd/module.conf
index 25793c72..25793c72 100644
--- a/remote/modules/sshd/sshd.conf
+++ b/remote/modules/sshd/module.conf
diff --git a/remote/modules/swiss/swiss.build b/remote/modules/swiss/module.build
index 1f016f6b..1f016f6b 100644
--- a/remote/modules/swiss/swiss.build
+++ b/remote/modules/swiss/module.build
diff --git a/remote/modules/swiss/swiss.conf b/remote/modules/swiss/module.conf
index e2f82123..e2f82123 100644
--- a/remote/modules/swiss/swiss.conf
+++ b/remote/modules/swiss/module.conf
diff --git a/remote/modules/swiss/swiss.conf.debian b/remote/modules/swiss/module.conf.debian
index a43faea2..a43faea2 100644
--- a/remote/modules/swiss/swiss.conf.debian
+++ b/remote/modules/swiss/module.conf.debian
diff --git a/remote/modules/swiss/swiss.conf.opensuse b/remote/modules/swiss/module.conf.opensuse
index 1311ac97..1311ac97 100644
--- a/remote/modules/swiss/swiss.conf.opensuse
+++ b/remote/modules/swiss/module.conf.opensuse
diff --git a/remote/modules/swiss/swiss.conf.scientific b/remote/modules/swiss/module.conf.scientific
index 88ac0d27..88ac0d27 100644
--- a/remote/modules/swiss/swiss.conf.scientific
+++ b/remote/modules/swiss/module.conf.scientific
diff --git a/remote/modules/swiss/swiss.conf.ubuntu b/remote/modules/swiss/module.conf.ubuntu
index 69694914..69694914 100644
--- a/remote/modules/swiss/swiss.conf.ubuntu
+++ b/remote/modules/swiss/module.conf.ubuntu
diff --git a/remote/modules/systemd/systemd.build b/remote/modules/systemd/module.build
index 95576548..95576548 100644
--- a/remote/modules/systemd/systemd.build
+++ b/remote/modules/systemd/module.build
diff --git a/remote/modules/systemd/systemd.build.scientific b/remote/modules/systemd/module.build.scientific
index 12170d81..12170d81 100644
--- a/remote/modules/systemd/systemd.build.scientific
+++ b/remote/modules/systemd/module.build.scientific
diff --git a/remote/modules/systemd/systemd.build.scientific.README b/remote/modules/systemd/module.build.scientific.README
index bad5a2d4..bad5a2d4 100644
--- a/remote/modules/systemd/systemd.build.scientific.README
+++ b/remote/modules/systemd/module.build.scientific.README
diff --git a/remote/modules/systemd/systemd.conf b/remote/modules/systemd/module.conf
index 4ca11365..4ca11365 100644
--- a/remote/modules/systemd/systemd.conf
+++ b/remote/modules/systemd/module.conf
diff --git a/remote/modules/systemd/systemd.conf.debian b/remote/modules/systemd/module.conf.debian
index 2768b51c..2768b51c 100644
--- a/remote/modules/systemd/systemd.conf.debian
+++ b/remote/modules/systemd/module.conf.debian
diff --git a/remote/modules/systemd/systemd.conf.opensuse b/remote/modules/systemd/module.conf.opensuse
index 9326a7dc..9326a7dc 100644
--- a/remote/modules/systemd/systemd.conf.opensuse
+++ b/remote/modules/systemd/module.conf.opensuse
diff --git a/remote/modules/systemd/systemd.conf.scientific b/remote/modules/systemd/module.conf.scientific
index 54e62b96..54e62b96 100644
--- a/remote/modules/systemd/systemd.conf.scientific
+++ b/remote/modules/systemd/module.conf.scientific
diff --git a/remote/modules/systemd/systemd.conf.ubuntu b/remote/modules/systemd/module.conf.ubuntu
index 2768b51c..2768b51c 100644
--- a/remote/modules/systemd/systemd.conf.ubuntu
+++ b/remote/modules/systemd/module.conf.ubuntu
diff --git a/remote/modules/udisks/udisks.build b/remote/modules/udisks/module.build
index ab9df016..ab9df016 100644
--- a/remote/modules/udisks/udisks.build
+++ b/remote/modules/udisks/module.build
diff --git a/remote/modules/udisks/udisks.conf b/remote/modules/udisks/module.conf
index 8ef6f29c..8ef6f29c 100644
--- a/remote/modules/udisks/udisks.conf
+++ b/remote/modules/udisks/module.conf
diff --git a/remote/modules/udisks/udisks.conf.debian b/remote/modules/udisks/module.conf.debian
index c32a5f24..c32a5f24 100644
--- a/remote/modules/udisks/udisks.conf.debian
+++ b/remote/modules/udisks/module.conf.debian
diff --git a/remote/modules/udisks/udisks.conf.opensuse b/remote/modules/udisks/module.conf.opensuse
index abf12be7..abf12be7 100644
--- a/remote/modules/udisks/udisks.conf.opensuse
+++ b/remote/modules/udisks/module.conf.opensuse
diff --git a/remote/modules/udisks/udisks.conf.ubuntu b/remote/modules/udisks/module.conf.ubuntu
index 3d127619..3d127619 100644
--- a/remote/modules/udisks/udisks.conf.ubuntu
+++ b/remote/modules/udisks/module.conf.ubuntu
diff --git a/remote/modules/udisks/udisks.conf.ubuntu.12 b/remote/modules/udisks/module.conf.ubuntu.12
index b962ec65..b962ec65 100644
--- a/remote/modules/udisks/udisks.conf.ubuntu.12
+++ b/remote/modules/udisks/module.conf.ubuntu.12
diff --git a/remote/modules/vbox/data/opt/openslx/scripts/systemd-vbox_env b/remote/modules/vbox/data/opt/openslx/scripts/systemd-vbox_env
index a69719ac..ece8c9f1 100755
--- a/remote/modules/vbox/data/opt/openslx/scripts/systemd-vbox_env
+++ b/remote/modules/vbox/data/opt/openslx/scripts/systemd-vbox_env
@@ -19,6 +19,9 @@ export PATH="$PATH":/opt/openslx/bin:/opt/openslx/sbin:/opt/openslx/usr/bin:/opt
 VBOX_CONF_DIR=/opt/openslx/etc/vbox
 VBOXMANAGE=$(which vboxmanage)
 
+# create required standard directories
+mkdir -p "/tmp/virt/virtualbox" -m 1777
+
 # load required Vbox modules
 for module in vboxdrv.ko vboxnetadp.ko vboxnetflt.ko vboxpci.ko ; do
   insmod /lib/modules/vbox/${module} || slxlog "vbox-systemd" "Loading of ${module} failed."
diff --git a/remote/modules/vbox/data/opt/openslx/scripts/vmchooser-xml_filter b/remote/modules/vbox/data/opt/openslx/scripts/vmchooser-xml_filter
new file mode 100755
index 00000000..c50b01a5
--- /dev/null
+++ b/remote/modules/vbox/data/opt/openslx/scripts/vmchooser-xml_filter
@@ -0,0 +1,74 @@
+#!/bin/bash
+# Probably needs bash somewhere
+# -----------------------------------------------------------------------------
+# Copyright (c) 2007..2009 - RZ Uni FR
+# Copyright (c) 2007..2011 - 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/
+# -----------------------------------------------------------------------------
+# xmlfilter.sh
+#    - This script is invoked by the vmchooser tool. It simply filters xml-
+#      files (taking the path to these files in $1). You might modify it in any
+#      way to match your needs, e.g. ask some database instead. You can re-
+#      implement it in any other programming language too. You simply have to
+#      return a list of proper xml files to be interpreted by the vmchooser
+#      binary). Please check for vmchooser.sh too ...
+# -----------------------------------------------------------------------------
+
+# This script .
+#
+# currently:
+#     - filter for slxgrp (which comes from /etc/machine-setup)
+#
+
+# include default directories
+. /opt/openslx/config
+
+if [ -f "${OPENSLX_DEFAULT_CONFDIR}/plugins/vmchooser/vmchooser.conf" ]; then
+	. "${OPENSLX_DEFAULT_CONFDIR}/plugins/vmchooser/vmchooser.conf"
+fi
+
+function handlePersistentVM() {
+	if grep --extended-regexp -q "<persistent param=\"(|.+:)$USER(|:.+)\"" "$1"; then
+		# If this virtual machine is useable as persistent version for current
+		# user we provide an additional persistent version.
+		# TODO: This evil black magic needs to be rewritten some day (by someone who understands it)
+		local originalImagePath=$(grep -io '<image_name param=.*"' "$1" | sed -e "s/&.*;/; /g" | awk -F '"' '{ print $2 }')
+		local imageName=$(basename "$originalImagePath")
+		eval export SLX_VM_PERSISTENT_PATH="${SLX_VM_PERSISTENT_PATH}" && \
+			local imagePath="${SLX_VM_PERSISTENT_PATH}${imageName}"
+		local persistentConfigVersionFilePath="$(mktemp --directory)/$(basename "$1")"
+		local vmchooserFilePath="$(dirname "$0")/vmchooser-clc"
+		if [ ! -f "$vmchooserFilePath" ]; then
+			vmchooserFilePath='/opt/openslx/scripts/vmchooser-clc'
+		fi
+		"$vmchooserFilePath" "$1" "$persistentConfigVersionFilePath" \
+			--create-persistent-config "$imagePath" && \
+			echo "$persistentConfigVersionFilePath"
+	fi
+}
+	
+for FILE in $(find -L "$1" -iname "*.xml"); do
+	# filter all xmls which aren't set active
+	grep -i -q "<active param=.*true.*" "$FILE" || continue
+	# HACK: filter all virtualbox images, as vbox is not ready yet
+	#grep -i -q "<virtualmachine param=.*virtualbox.*" "$FILE" && continue
+	if [ -n "${SLX_VM_POOL_FILTER}" ]; then
+		# filter all xmls with pool-param not equal to vmchooser::env
+		if [ $(grep "<pools param=\"${SLX_VM_POOL_FILTER}\"" "$FILE" | wc -l) -eq 1 ]; then
+			handlePersistentVM "$FILE"
+			echo "$FILE"
+		fi
+	else
+		handlePersistentVM "$FILE"
+		# if there is no pool set, just take all available xmls
+		echo "$FILE"
+	fi
+done
+
diff --git a/remote/modules/vbox/vbox.build b/remote/modules/vbox/module.build
index f095b4e2..f095b4e2 100644
--- a/remote/modules/vbox/vbox.build
+++ b/remote/modules/vbox/module.build
diff --git a/remote/modules/vbox/vbox.conf b/remote/modules/vbox/module.conf
index 29067791..29067791 100644
--- a/remote/modules/vbox/vbox.conf
+++ b/remote/modules/vbox/module.conf
diff --git a/remote/modules/vbox/vbox.conf.opensuse b/remote/modules/vbox/module.conf.opensuse
index e69de29b..e69de29b 100644
--- a/remote/modules/vbox/vbox.conf.opensuse
+++ b/remote/modules/vbox/module.conf.opensuse
diff --git a/remote/modules/vbox/vbox.conf.opensuse.12.3 b/remote/modules/vbox/module.conf.opensuse.12.3
index ae42e8aa..ae42e8aa 100644
--- a/remote/modules/vbox/vbox.conf.opensuse.12.3
+++ b/remote/modules/vbox/module.conf.opensuse.12.3
diff --git a/remote/modules/vbox/vbox.conf.ubuntu b/remote/modules/vbox/module.conf.ubuntu
index 4efbd571..4efbd571 100644
--- a/remote/modules/vbox/vbox.conf.ubuntu
+++ b/remote/modules/vbox/module.conf.ubuntu
diff --git a/remote/modules/vbox/vbox.conf.ubuntu.13.04 b/remote/modules/vbox/module.conf.ubuntu.13.04
index fbef8447..fbef8447 100644
--- a/remote/modules/vbox/vbox.conf.ubuntu.13.04
+++ b/remote/modules/vbox/module.conf.ubuntu.13.04
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 2cd92776..f9b4aaf1 100755
--- a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
+++ b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
@@ -472,6 +472,7 @@ cp "$VMCHOOSER_DIR/data/openslx.exe" "$VMCHOOSER_DIR/fd-loop/"
 unset vm_diskfile
 unset vm_revision
 unset dnbd3
+unset dnbd3error
 if [ -n "$SLX_DNBD3_SERVERS" -o -n "$SLX_DNBD3_PRIO_SERVERS" ] && [ "x$SLX_VM_DNBD3" = "xyes" ]; then
 	if [ -e "/dev/dnbd0" -a -e "/var/run/dnbd3.socket" ]; then
 		# Shuffle server list
@@ -486,9 +487,11 @@ if [ -n "$SLX_DNBD3_SERVERS" -o -n "$SLX_DNBD3_PRIO_SERVERS" ] && [ "x$SLX_VM_DN
 				vmpath="$vm_diskfile"
 				break
 			fi
+			dnbd3error="$dnbd3error ($RET/$dnbd3)"
+			usleep 200000
 		done
 		if [ -z "$vm_diskfile" ]; then
-			slxlog "virt-dnbd3" "No dnbd3 server for ${vmpath#/mnt/vmstore/} found ($SLX_DNBD3_PRIO_SERVERS $TMP_SERVERS), trying NFS..."
+			slxlog "virt-dnbd3" "No dnbd3 server for ${vmpath#/mnt/vmstore/} found ($SLX_DNBD3_PRIO_SERVERS $TMP_SERVERS $dnbd3error), trying NFS..."
 			writelog "No working dnbd3 server found :-("
 		fi
 	else
diff --git a/remote/modules/vmchooser/vmchooser.build b/remote/modules/vmchooser/module.build
index eb0a2d48..eb0a2d48 100644
--- a/remote/modules/vmchooser/vmchooser.build
+++ b/remote/modules/vmchooser/module.build
diff --git a/remote/modules/vmchooser/vmchooser.conf b/remote/modules/vmchooser/module.conf
index 686eb8bf..686eb8bf 100644
--- a/remote/modules/vmchooser/vmchooser.conf
+++ b/remote/modules/vmchooser/module.conf
diff --git a/remote/modules/vmchooser/vmchooser.conf.debian b/remote/modules/vmchooser/module.conf.debian
index 2953ac63..2953ac63 100644
--- a/remote/modules/vmchooser/vmchooser.conf.debian
+++ b/remote/modules/vmchooser/module.conf.debian
diff --git a/remote/modules/vmchooser/vmchooser.conf.opensuse b/remote/modules/vmchooser/module.conf.opensuse
index 75cb7dd6..75cb7dd6 100644
--- a/remote/modules/vmchooser/vmchooser.conf.opensuse
+++ b/remote/modules/vmchooser/module.conf.opensuse
diff --git a/remote/modules/vmchooser/vmchooser.conf.ubuntu b/remote/modules/vmchooser/module.conf.ubuntu
index 2953ac63..2953ac63 100644
--- a/remote/modules/vmchooser/vmchooser.conf.ubuntu
+++ b/remote/modules/vmchooser/module.conf.ubuntu
diff --git a/remote/modules/vmware/vmware.build b/remote/modules/vmware/module.build
index 98ee2b8d..98ee2b8d 100644
--- a/remote/modules/vmware/vmware.build
+++ b/remote/modules/vmware/module.build
diff --git a/remote/modules/vmware/module.conf b/remote/modules/vmware/module.conf
new file mode 100644
index 00000000..749a0838
--- /dev/null
+++ b/remote/modules/vmware/module.conf
@@ -0,0 +1,68 @@
+REQUIRED_DOWNLOAD_BASE="http://softwareupdate.vmware.com/cds/vmw-desktop/ws/10.0.1/1379776/linux/core/"
+REQUIRED_TYPE="workstation"
+REQUIRED_MODULES="kernel"
+REQUIRED_DIRECTORIES="
+	/etc/vmware
+	/usr/sbin
+	/usr/lib/vmware/bin
+	/usr/lib/vmware/hostd
+	/usr/lib/vmware/icu
+	/usr/lib/vmware/lib
+	/usr/lib/vmware/libconf
+	/usr/lib/vmware/licenses
+	/usr/lib/vmware/resources
+	/usr/lib/vmware/scripts
+	/usr/lib/vmware/share
+	/usr/lib/vmware/xkeymap
+"
+REQUIRED_FILES="
+	/usr/lib/vmware/config
+	/usr/bin/vmware-usbarbitrator
+"
+REQUIRED_BINARIES="
+	vmnet-netifup
+"
+
+REQUIRED_VMWARE_DELETIONS="
+	/var/lib/vmware
+	/etc/vmw*
+	/etc/rc?.d/???vmware*
+	/etc/rc0.d/K06vmware-workstation-server
+	/etc/pam.d/vmware-authd
+	/etc/rc3.d/S25vmamqpd
+	/etc/xdg/menus/applications-merged
+	/etc/init.d/vmamqpd
+	/etc/init.d/vmware*
+	/etc/thnuclnt
+	/etc/cups/thnuclnt.convs
+	/etc/cups/thnuclnt.types
+	/etc/modprobe.d/vmware-fuse.conf
+	/lib/modules/3.11.0-13-generic/misc/vmnet.ko
+	/lib/modules/3.11.0-13-generic/misc/vmmon.ko
+	/usr/share/mime/packages/vmware-player.xml
+	/usr/share/applications/vmware*
+	/usr/share/desktop-directories/vmware-ace-vms.directory
+	/usr/share/man/man1/vmware.1.gz
+	/usr/share/doc/vmware*
+	/usr/share/icons/hicolor/*/mimetypes/application-certificate.png
+	/usr/share/icons/hicolor/*/apps/vmware*
+	/usr/share/icons/hicolor/*/mimetypes/*vmware*
+	/usr/bin/vmnet-dhcpd
+	/usr/bin/ovftool
+	/usr/bin/vmrun
+	/usr/bin/vmware-wssc-adminTool
+	/usr/bin/vmnet-bridge
+	/usr/bin/vmplayer
+	/usr/bin/vmnet-sniffer
+	/usr/bin/vmss2core
+	/usr/bin/vm-support
+	/usr/bin/vmnet-natd
+	/usr/bin/vmnet-netifup
+	/usr/bin/vmware*
+	/usr/include/vmware-vix
+	/usr/lib/libvixAllProducts.so
+	/usr/lib/cups/filter/thnucups
+	/usr/lib/diskLibWrapper.so
+	/usr/lib/vmware*
+	/usr/sbin/vmware*
+"
diff --git a/remote/modules/vmware/vmware.conf.ubuntu b/remote/modules/vmware/module.conf.ubuntu
index c75ee906..c75ee906 100644
--- a/remote/modules/vmware/vmware.conf.ubuntu
+++ b/remote/modules/vmware/module.conf.ubuntu
diff --git a/remote/modules/vmware/vmware.conf b/remote/modules/vmware/vmware.conf
deleted file mode 100644
index 017d1d5b..00000000
--- a/remote/modules/vmware/vmware.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-REQUIRED_DOWNLOAD_BASE="http://softwareupdate.vmware.com/cds/vmw-desktop/ws/10.0.1/1379776/linux/core/"
-REQUIRED_TYPE="workstation"
-REQUIRED_MODULES="kernel"
-REQUIRED_DIRECTORIES="
-	/etc/vmware
-	/usr/sbin
-	/usr/lib/vmware/bin
-	/usr/lib/vmware/hostd
-	/usr/lib/vmware/icu
-	/usr/lib/vmware/lib
-	/usr/lib/vmware/libconf
-	/usr/lib/vmware/licenses
-	/usr/lib/vmware/resources
-	/usr/lib/vmware/scripts
-	/usr/lib/vmware/share
-	/usr/lib/vmware/xkeymap
-"
-REQUIRED_FILES="
-	/usr/lib/vmware/config
-	/usr/bin/vmware-usbarbitrator
-"
-REQUIRED_BINARIES="
-	vmnet-netifup
-"
diff --git a/remote/modules/xorg/xorg.build b/remote/modules/xorg/module.build
index 16e0bb5b..16e0bb5b 100644
--- a/remote/modules/xorg/xorg.build
+++ b/remote/modules/xorg/module.build
diff --git a/remote/modules/xorg/xorg.conf b/remote/modules/xorg/module.conf
index b99f0e2a..b99f0e2a 100644
--- a/remote/modules/xorg/xorg.conf
+++ b/remote/modules/xorg/module.conf
diff --git a/remote/modules/xorg/xorg.conf.debian b/remote/modules/xorg/module.conf.debian
index 2cc9d6f1..2cc9d6f1 100644
--- a/remote/modules/xorg/xorg.conf.debian
+++ b/remote/modules/xorg/module.conf.debian
diff --git a/remote/modules/xorg/xorg.conf.opensuse b/remote/modules/xorg/module.conf.opensuse
index 1e6f5ff1..1e6f5ff1 100644
--- a/remote/modules/xorg/xorg.conf.opensuse
+++ b/remote/modules/xorg/module.conf.opensuse
diff --git a/remote/modules/xorg/xorg.conf.opensuse.13.1 b/remote/modules/xorg/module.conf.opensuse.13.1
index 6199ed15..6199ed15 100644
--- a/remote/modules/xorg/xorg.conf.opensuse.13.1
+++ b/remote/modules/xorg/module.conf.opensuse.13.1
diff --git a/remote/modules/xorg/xorg.conf.ubuntu b/remote/modules/xorg/module.conf.ubuntu
index 69c3e64c..69c3e64c 100644
--- a/remote/modules/xorg/xorg.conf.ubuntu
+++ b/remote/modules/xorg/module.conf.ubuntu