summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Schneider2014-11-27 16:49:32 +0100
committerManuel Schneider2014-11-27 16:49:32 +0100
commit58d4cb6b58258dfca314321c511b186f1b9e6247 (patch)
tree27d9ae150fa9a6b90269aa148926ebd78d5791da
parentMerge branch 'master' of git.openslx.org:openslx-ng/tm-scripts (diff)
downloadtm-scripts-58d4cb6b58258dfca314321c511b186f1b9e6247.tar.gz
tm-scripts-58d4cb6b58258dfca314321c511b186f1b9e6247.tar.xz
tm-scripts-58d4cb6b58258dfca314321c511b186f1b9e6247.zip
[vmchooser2] Start session scripts instead of sourcing
-rwxr-xr-x[-rw-r--r--]remote/modules/beamergui/data/opt/openslx/vmchooser/sessionstart.d/99-kill_beamergui2
-rwxr-xr-x[-rw-r--r--]remote/modules/pvs2/data/opt/openslx/vmchooser/sessionstart.d/50-PVSclient2
-rwxr-xr-xremote/modules/vmchooser2/data/opt/openslx/vmchooser/sessionstart2
3 files changed, 3 insertions, 3 deletions
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
index 13d9c4ed..1b4e61c8 100644..100755
--- 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
index a12eec9e..7b28889d 100644..100755
--- 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