fix vnc stop

diff --git a/conf/etc/default/vncserver b/conf/etc/default/vncserver
index 41409b745c6b5f6ced4a3dc92d42f8bb8eb15c63..13091006e9c9fa30b7ecfd206e41ce32976213c0 100644 (file)
--- a/conf/etc/default/vncserver
+++ b/conf/etc/default/vncserver
@@ -5,7 +5,7 @@ START_DAEMON=yes
 USER=telecaster
 
 # The vncserver port (i.e. 2 for 5902)
-PORT="1"
+PORT="2"
 
 # Options to pass to vncserver
 OPTIONS="-geometry 1024x768 -depth 8"

diff --git a/conf/etc/init.d/vncserver b/conf/etc/init.d/vncserver
index 62909d76fb21049d4a0ac69c1b21d7b19785bbf1..dad8e0a53d8cda5b309afa0da507a3e9003b3e4d 100755 (executable)
--- a/conf/etc/init.d/vncserver
+++ b/conf/etc/init.d/vncserver
@@ -31,13 +31,13 @@ test -f $DAEMON || exit 0
 
 case "$1" in
        start)  
-               log_begin_msg "Starting vncserver audio server:" "vncserver"
+           log_begin_msg "Starting vncserver audio server:" "vncserver"
             echo $DAEMON $OPTIONS :$PORT' &' > $VNCHOME/.vncserverinit
             chmod +x $VNCHOME/.vncserverinit
             su -c $VNCHOME/.vncserverinit $USER > ${LOG}
-               sleep 2
+           sleep 2
             pid=`pgrep -u ${USER} vncserver` 
-               if [ pid = '' ]; then
+           if [ pid = '' ]; then
                        log_failure_msg "Vncserver daemon can't be started! Check logfile: ${LOG}"
             else
                 echo $pid > $PIDFILE
@@ -48,8 +48,9 @@ case "$1" in
                log_begin_msg "Stopping vncserver audio server:" "vncserver"
                 pid=`cat $PIDFILE | sed -e 's/\s.*//'|head -n1` 
                if [ ! pid = '' ]; then
-                        vncserver -kill :$PORT
-                        pkill -9 edcast_jack
+                       su -c "pkill -9 edcast_jack" $USER
+                       sleep 1
+                        su -c "vncserver -kill :$PORT" $USER
                        log_end_msg 0
                else
                        log_end_msg 1