diff options
| author | root | 2016-05-25 10:35:26 +0200 |
|---|---|---|
| committer | root | 2016-05-25 10:35:26 +0200 |
| commit | 111adbfe6603cf7122b57d092abe9553e2815913 (patch) | |
| tree | decdd0e7b241ce0f37033a468f5e54a649f5f7da /remote/modules/pvs2/data | |
| parent | [rfs-stage32] Use proper variable in conf (diff) | |
| parent | [pvs-fr] Konfig -114 (diff) | |
| download | tm-scripts-111adbfe6603cf7122b57d092abe9553e2815913.tar.gz tm-scripts-111adbfe6603cf7122b57d092abe9553e2815913.tar.xz tm-scripts-111adbfe6603cf7122b57d092abe9553e2815913.zip | |
Merge branch 'master' of git://git.openslx.org/openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules/pvs2/data')
3 files changed, 18 insertions, 3 deletions
diff --git a/remote/modules/pvs2/data/opt/openslx/bin/pvsstartup b/remote/modules/pvs2/data/opt/openslx/bin/pvsstartup new file mode 100755 index 00000000..def24a81 --- /dev/null +++ b/remote/modules/pvs2/data/opt/openslx/bin/pvsstartup @@ -0,0 +1,15 @@ +#!/bin/ash + +# TODO UNTESTED! +timediff=5 +while [ $timediff -gt 3 ]; do + start="$(date +%s)" + pvsclient $@ + ret=$? + end="$(date +%s)" + /opt/openslx/pvs2/unlock.sh + [ "$ret" == "0" ] && break + timediff=$(( end - start )) +done + + diff --git a/remote/modules/pvs2/data/opt/openslx/scripts/setup-pvsmgr b/remote/modules/pvs2/data/opt/openslx/scripts/setup-pvsmgr index dedb0995..7a6c13d9 100755 --- a/remote/modules/pvs2/data/opt/openslx/scripts/setup-pvsmgr +++ b/remote/modules/pvs2/data/opt/openslx/scripts/setup-pvsmgr @@ -1,4 +1,4 @@ #!/bin/ash openbox & -exec /opt/openslx/bin/pvsmgr +exec /opt/openslx/bin/pvsmgr --manager-only 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 0ad739e0..86f26a17 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 @@ -19,8 +19,8 @@ if [ -n "${PVSMGR_SESSION_CMD}" ]; then fi # 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 & + pvsstartup --auto & else - pvsclient & + pvsstartup & fi exit 0 |