SOURCES: conserver.init Verify configuration instead of failing si...

[arekm]

Author: arekm                        Date: Fri Jan 19 23:00:22 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
Verify configuration instead of failing silently.

---- Files affected:
SOURCES:
   conserver.init (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/conserver.init
diff -u SOURCES/conserver.init:1.2 SOURCES/conserver.init:1.3
--- SOURCES/conserver.init:1.2	Thu Dec  8 02:02:49 2005
+++ SOURCES/conserver.init	Sat Jan 20 00:00:16 2007
@@ -19,13 +19,18 @@
   start)
 	# Check if the service is already running?
 	if [ ! -f /var/lock/subsys/conserver ]; then
-		msg_starting "conserver"
-		OPTIONS="-d"
-		[ -n "$LISTEN_IPADDR" ] && OPTIONS="$OPTIONS -M$LISTEN_IPADDR"
-		[ -n "$LISTEN_PORT" ] && OPTIONS="$OPTIONS -p$LISTEN_PORT"
-		daemon conserver $OPTIONS $CMDLINE_OPTIONS < /dev/null
+		msg_starting "conserver configuration verification" 
+		daemon conserver -S
 		RETVAL=$?
-		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/conserver
+		if [ $RETVAL -eq 0 ]; then
+			msg_starting "conserver"
+			OPTIONS="-d"
+			[ -n "$LISTEN_IPADDR" ] && OPTIONS="$OPTIONS -M$LISTEN_IPADDR"
+			[ -n "$LISTEN_PORT" ] && OPTIONS="$OPTIONS -p$LISTEN_PORT"
+			daemon conserver $OPTIONS $CMDLINE_OPTIONS < /dev/null
+			RETVAL=$?
+			[ $RETVAL -eq 0 ] && touch /var/lock/subsys/conserver
+		fi
 	else
 		msg_already_running "conserver"
 	fi
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/conserver.init?r1=1.2&r2=1.3&f=u