diff options
| author | Sebastian | 2016-04-25 12:01:08 +0200 |
|---|---|---|
| committer | Sebastian | 2016-04-25 12:01:08 +0200 |
| commit | 5acda3eaeabae9045609539303a8c12c4ce401f1 (patch) | |
| tree | 7e71975f8570b05aafe2ea6ec0e242a8912387bb /core/modules/pvs2/data | |
| parent | initial commit (diff) | |
| download | mltk-5acda3eaeabae9045609539303a8c12c4ce401f1.tar.gz mltk-5acda3eaeabae9045609539303a8c12c4ce401f1.tar.xz mltk-5acda3eaeabae9045609539303a8c12c4ce401f1.zip | |
merge with latest dev version
Diffstat (limited to 'core/modules/pvs2/data')
3 files changed, 37 insertions, 0 deletions
diff --git a/core/modules/pvs2/data/opt/openslx/scripts/setup-pvsmgr b/core/modules/pvs2/data/opt/openslx/scripts/setup-pvsmgr new file mode 100755 index 00000000..dedb0995 --- /dev/null +++ b/core/modules/pvs2/data/opt/openslx/scripts/setup-pvsmgr @@ -0,0 +1,4 @@ +#!/bin/ash + +openbox & +exec /opt/openslx/bin/pvsmgr diff --git a/core/modules/pvs2/data/opt/openslx/vmchooser/sessionstart.d/50-PVSclient b/core/modules/pvs2/data/opt/openslx/vmchooser/sessionstart.d/50-PVSclient new file mode 100755 index 00000000..0ad739e0 --- /dev/null +++ b/core/modules/pvs2/data/opt/openslx/vmchooser/sessionstart.d/50-PVSclient @@ -0,0 +1,26 @@ +#!/bin/ash + +# SESSION_TYPE can be either 'VSESSION' or 'XSESSION' - currently not evaluated + +# detect session command of the PVS-Manager session by looking at the xsession file +PVSMGR_SESSION_CMD= +PVSMGR_XSESSION_FILE="pvs2mgr.desktop" +# the second directory should not be needed, but lets be compatible with the old crap...... +for DIR in "/usr/share/xsessions" "/opt/openslx/xsessions/"; do + if [ -f "${DIR}/${PVSMGR_XSESSION_FILE}" ]; then + # extract the exact command string + PVSMGR_SESSION_CMD="$(grep -E "^Exec=.*$" "${DIR}/${PVSMGR_XSESSION_FILE}" |cut -c 6-)" + break + fi +done +if [ -n "${PVSMGR_SESSION_CMD}" ]; then + # do not start pvsclient if we are running the pvs manager session + [ "x${SESSION_CMD}" == "x${PVSMGR_SESSION_CMD}" ] && exit 0 +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 & +else + pvsclient & +fi +exit 0 diff --git a/core/modules/pvs2/data/usr/share/xsessions/pvs2mgr.desktop b/core/modules/pvs2/data/usr/share/xsessions/pvs2mgr.desktop new file mode 100755 index 00000000..3cd1be2c --- /dev/null +++ b/core/modules/pvs2/data/usr/share/xsessions/pvs2mgr.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=PVS Steuerkonsole +Exec=/opt/openslx/scripts/setup-pvsmgr +TryExec=/opt/openslx/bin/pvsmgr +Icon= +Type=Application |