From f305213f3d0ef66e3e6eed1fa353c1992f48761e Mon Sep 17 00:00:00 2001
From: yomguy <>
Date: Fri, 19 Nov 2010 13:09:56 +0000
Subject: [PATCH] fix vnc stop

---
 conf/etc/default/vncserver |  2 +-
 conf/etc/init.d/vncserver  | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/conf/etc/default/vncserver b/conf/etc/default/vncserver
index 41409b7..1309100 100644
--- 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 62909d7..dad8e0a 100755
--- 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
-- 
2.39.5