Attachment 882362 Details for Bug 949522 – Here is the change I plan to make (sorry, missed a bit in the last one)

[patch] Here is the change I plan to make (sorry, missed a bit in the last one)

vncserver.init-diff (text/plain), 1.87 KB, created by Tim Waugh on 2014-04-03 15:34:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Waugh

Created: 2014-04-03 15:34:42 UTC

Size: 1.87 KB

patch

obsolete

>diff --git a/vncserver.init b/vncserver.init
>index 880261f..3a29382 100644
>--- a/vncserver.init
>+++ b/vncserver.init
>@@ -43,6 +43,7 @@ start() {
>         restorecon /tmp/.X11-unix 2>/dev/null || :
>     fi
> 
>+    STARTED=0
>     for display in ${VNCSERVERS}
>     do
>         SERVS=1
>@@ -50,24 +51,16 @@ start() {
> 	DISP="${display%%:*}"
> 	USER="${display##*:}"
> 	VNCUSERARGS="${VNCSERVERARGS[${DISP}]}"
>-        runuser -l ${USER} -c \
>-		"cd ~${USER} &&
>-		 if [ -r .vnc/passwd ]; then
>-			 vncserver :${DISP} ${VNCUSERARGS}
>-		 else
>-			 echo
>-			 echo VNC password for user ${USER} is not configured
>-			 exit 1;
>-		 fi;"
>-        RETVAL=$?
>-        [ "$RETVAL" -eq 0 ] || break
>+        runuser -l ${USER} -c "vncserver :${DISP} ${VNCUSERARGS}" < /dev/null
>+	RETVAL=$?
>+	[ "$RETVAL" -eq 0 ] && STARTED=`expr $STARTED + 1`
>     done
>     if [ -z "$SERVS" ]; then
>         echo -n "no displays configured "
>         failure
>         RETVAL=6
>     else
>-        if [ "$RETVAL" -eq 0 ]; then
>+        if [ "$STARTED" -gt 0 ]; then
> 	    success $"vncserver startup"
> 	    touch /var/lock/subsys/Xvnc
>         else 
>@@ -91,22 +84,26 @@ stop() {
>     status Xvnc > /dev/null 2>&1
>     RETVAL=$?
> 
>+    STOPPED=0
>     # 3 means service is already stopped
>     if ! [ "$RETVAL" -eq 3 ]; then
> 	for display in ${VNCSERVERS}; do
> 	    echo -n "${display} "
> 	    export USER="${display##*:}"
> 	    runuser ${USER} -c "vncserver -kill :${display%%:*}" >/dev/null 2>&1
>+	    RETVAL=$?
>+	    [ "$RETVAL" -eq 0 ] && STOPPED=`expr $STOPPED + 1`
> 	done
> 	RETVAL=$?
>     else
>+	let STOPPED=1
> 	let RETVAL=0
>     fi
> 
>-    [ "$RETVAL" -eq 0 ] && success $"vncserver shutdown" || \
>+    [ "$STOPPED" -gt 0 ] && success $"vncserver shutdown" || \
> 	failure $"vncserver shutdown"
>     echo
>-    [ "$RETVAL" -eq 0 ] && rm -f /var/lock/subsys/Xvnc
>+    [ "$STOPPED" -eq 0 ] && rm -f /var/lock/subsys/Xvnc
>     return "$RETVAL"
> }
>

Actions: View | Diff

Attachments on bug 949522: 732654 | 825796 | 882348 | 882362