diff options
| author | Dirk von Suchodoletz | 2009-09-10 22:11:01 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2009-09-10 22:11:01 +0200 |
| commit | 851ded7ba77502d16c17729a53ef6ac4c11011e5 (patch) | |
| tree | 0dce9e83a97ed860b53238071ebdc19d7fc5f035 | |
| parent | Execution order for acpid, messagebus, haldaemon in Scilin. (diff) | |
| download | core-851ded7ba77502d16c17729a53ef6ac4c11011e5.tar.gz core-851ded7ba77502d16c17729a53ef6ac4c11011e5.tar.xz core-851ded7ba77502d16c17729a53ef6ac4c11011e5.zip | |
Script fix (plugin not useable yet) ...
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@3155 95ad53e4-c205-0410-b2fa-d234c58c8868
| -rwxr-xr-x | os-plugins/plugins/pvs/files/pvs-vncsrv | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/os-plugins/plugins/pvs/files/pvs-vncsrv b/os-plugins/plugins/pvs/files/pvs-vncsrv index cdffbc82..966bf1df 100755 --- a/os-plugins/plugins/pvs/files/pvs-vncsrv +++ b/os-plugins/plugins/pvs/files/pvs-vncsrv @@ -19,8 +19,8 @@ # ----------------------------------------------------------------------------- # parameters for x11vnc -X11VNC_PARAMS="-bg -forever -display :0 -passwdfile rm:~/.pvs/vncpasswd -o /var/log/x11vnc.log -shared" -X11VNC_X11="1" +X11VNC_PARAMS="-bg -forever -display :0 -passwdfile rm:$HOME/.pvs/vncpasswd -o $HOME/.pvs/log.vncsrv -shared" +X11VNC_X11="0" # at the moment the poolVSClient is expected to use the ~/.pvs directory [ -d ~/.pvs ] || mkdir ~/.pvs @@ -68,6 +68,7 @@ case "$1" in start) [ -z "$2" -o -z "$3" ] && echo " Port and/or Password not set" \ >>~/.pvs/log.vncsrv + echo "$2 $3" >>~/.pvs/log.test if [ ! -f ~/.pvs/vncpasswd ]; then echo " Start FAILED (~/.pvs/vncpasswd not found)" >>~/.pvs/log.vncsrv echo " Create it manualy and retry starting x11vnc" >>~/.pvs/log.vncsrv @@ -75,12 +76,12 @@ case "$1" in fi if [ $X11VNC_X11 = 1 ]; then - find_xauth + # find_xauth START_COMMAND="$START_COMMAND -auth $XAUTHORITY $X11VNC_PARAMS" else START_COMMAND="$START_COMMAND $X11VNC_PARAMS" fi - OUTPUT=$($START_COMMAND) + OUTPUT=$($START_COMMAND -rfbport $2) echo "$START_COMMAND" >>~/.pvs/log.vncsrv echo "$OUTPUT" >>~/.pvs/log.vncsrv ;; @@ -91,7 +92,7 @@ case "$1" in echo "x11vnc not running" >>~/.pvs/log.vncsrv exit -1; else - kill -9 $pid + kill -9 $pid 2>/dev/null echo "x11vnc stopped" >>~/.pvs/log.vncsrv fi ;; |