From 0040d1d324d4afe637205ccd5838d226443f1106 Mon Sep 17 00:00:00 2001
From: Manuel Schneider
Date: Wed, 26 Nov 2014 12:21:00 +0100
Subject: [PVS2] Remove unexpected 'fi'

---
 .../pvs2/data/opt/openslx/vmchooser/sessionstart.d/50-PVSclient    | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'remote/modules/pvs2')

diff --git a/remote/modules/pvs2/data/opt/openslx/vmchooser/sessionstart.d/50-PVSclient b/remote/modules/pvs2/data/opt/openslx/vmchooser/sessionstart.d/50-PVSclient
index bef2449b..a12eec9e 100644
--- a/remote/modules/pvs2/data/opt/openslx/vmchooser/sessionstart.d/50-PVSclient
+++ b/remote/modules/pvs2/data/opt/openslx/vmchooser/sessionstart.d/50-PVSclient
@@ -2,9 +2,8 @@
 
 # If the ENV var PVS has been set by vmchooser start pvsclient
 if [ -n "$PVS_AUTO_CONNECT" -a "$PVS_AUTO_CONNECT" == "TRUE" ]; then
-		pvsclient --auto &
-	else
-		pvsclient &
-	fi
+  pvsclient --auto &
+else
+  pvsclient &
 fi
 
-- 
cgit v1.2.3-55-g7522


From 58d4cb6b58258dfca314321c511b186f1b9e6247 Mon Sep 17 00:00:00 2001
From: Manuel Schneider
Date: Thu, 27 Nov 2014 16:49:32 +0100
Subject: [vmchooser2] Start session scripts instead of sourcing

---
 .../data/opt/openslx/vmchooser/sessionstart.d/99-kill_beamergui         | 2 +-
 .../modules/pvs2/data/opt/openslx/vmchooser/sessionstart.d/50-PVSclient | 2 +-
 remote/modules/vmchooser2/data/opt/openslx/vmchooser/sessionstart       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 remote/modules/beamergui/data/opt/openslx/vmchooser/sessionstart.d/99-kill_beamergui
 mode change 100644 => 100755 remote/modules/pvs2/data/opt/openslx/vmchooser/sessionstart.d/50-PVSclient

(limited to 'remote/modules/pvs2')

diff --git a/remote/modules/beamergui/data/opt/openslx/vmchooser/sessionstart.d/99-kill_beamergui b/remote/modules/beamergui/data/opt/openslx/vmchooser/sessionstart.d/99-kill_beamergui
old mode 100644
new mode 100755
index 13d9c4ed..1b4e61c8
--- a/remote/modules/beamergui/data/opt/openslx/vmchooser/sessionstart.d/99-kill_beamergui
+++ b/remote/modules/beamergui/data/opt/openslx/vmchooser/sessionstart.d/99-kill_beamergui
@@ -1,3 +1,3 @@
 #!/bin/ash
 killall beamergui
-true
+exit 0
diff --git a/remote/modules/pvs2/data/opt/openslx/vmchooser/sessionstart.d/50-PVSclient b/remote/modules/pvs2/data/opt/openslx/vmchooser/sessionstart.d/50-PVSclient
old mode 100644
new mode 100755
index a12eec9e..7b28889d
--- a/remote/modules/pvs2/data/opt/openslx/vmchooser/sessionstart.d/50-PVSclient
+++ b/remote/modules/pvs2/data/opt/openslx/vmchooser/sessionstart.d/50-PVSclient
@@ -6,4 +6,4 @@ if [ -n "$PVS_AUTO_CONNECT" -a "$PVS_AUTO_CONNECT" == "TRUE" ]; then
 else
   pvsclient &
 fi
-
+exit 0
diff --git a/remote/modules/vmchooser2/data/opt/openslx/vmchooser/sessionstart b/remote/modules/vmchooser2/data/opt/openslx/vmchooser/sessionstart
index 86511458..be3235c1 100755
--- a/remote/modules/vmchooser2/data/opt/openslx/vmchooser/sessionstart
+++ b/remote/modules/vmchooser2/data/opt/openslx/vmchooser/sessionstart
@@ -4,7 +4,7 @@ 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"
+		"$file" || slxlog "vmchooser-sessionstart" "Could not source $file at session start!" "$file"
 	done
 fi
 
-- 
cgit v1.2.3-55-g7522