From 0012b64ec1a080051ed41f5b4f19bc68c0f0af12 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 12 Dec 2013 20:39:53 +0100
Subject: [vmchooser] Fix NFS fallback once again

---
 remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

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 43880a2c..2d6dfb41 100755
--- a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
+++ b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt
@@ -485,8 +485,8 @@ else
 fi
 
 if [ -z "$vm_diskfile" ]; then
-	new_vmpath=$(ls "${vmpath}.r"* | grep -E '\.r[0-9]+$' | grep -o -E '[0-9]+' | sort -n | tail -1)
-	[ -n "$new_vmpath" ] && vmpath="$vmpath$new_vmpath"
+	new_vmpath=$(ls "${vmpath}.r"* | grep -E -o '\.r[0-9]+$' | grep -o -E '[0-9]+' | sort -n | tail -1)
+	[ -n "$new_vmpath" ] && vmpath="${vmpath}.r${new_vmpath}"
 	vm_diskfile="$vmpath"
 fi
 
-- 
cgit v1.2.3-55-g7522


From e8f98ce4198f1234b022147931087df5bcfea821 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 13 Dec 2013 16:26:53 +0100
Subject: [vmchooser] Add sessionstart script that will source everything in
 sessionstart.d Needed for beamergui. This is pretty much the same as Xsession
 with Xsession.d, since the vmchooser is technically the session, but we might
 want to run things when the actual session selected in the vmchooser starts.

---
 .../modules/vmchooser/data/opt/openslx/vmchooser/sessionstart  | 10 ++++++++++
 remote/modules/vmchooser/vmchooser.build                       |  1 -
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100755 remote/modules/vmchooser/data/opt/openslx/vmchooser/sessionstart

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

diff --git a/remote/modules/vmchooser/data/opt/openslx/vmchooser/sessionstart b/remote/modules/vmchooser/data/opt/openslx/vmchooser/sessionstart
new file mode 100755
index 00000000..aa7e54c6
--- /dev/null
+++ b/remote/modules/vmchooser/data/opt/openslx/vmchooser/sessionstart
@@ -0,0 +1,10 @@
+#!/bin/ash
+
+SOURCEPATH="/opt/openslx/vmchooser/sessionstart.d"
+
+if [ -d "$SOURCEPATH" ]; then
+	for file in $SOURCEPATH/*; do
+		. "$file" || slxlog "vmchooser-sessionstart" "Could not source $file at session start!" "$file"
+	done
+fi
+
diff --git a/remote/modules/vmchooser/vmchooser.build b/remote/modules/vmchooser/vmchooser.build
index 58f5986e..eb0a2d48 100644
--- a/remote/modules/vmchooser/vmchooser.build
+++ b/remote/modules/vmchooser/vmchooser.build
@@ -1,4 +1,3 @@
-#!/bin/bash
 
 fetch_source() {
 	git clone "${REQUIRED_GIT}" src
-- 
cgit v1.2.3-55-g7522