From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Fri, 19 Jan 2007 23:00:16 +0000 (+0000)
Subject: Verify configuration instead of failing silently.
X-Git-Tag: auto/th/conserver-8_1_16-1~10
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fconserver.git;a=commitdiff_plain;h=a0deaf8bbfa354b49a9e42c2fcc8a8a7cf367aca

Verify configuration instead of failing silently.

Changed files:
    conserver.init -> 1.3
---

diff --git a/conserver.init b/conserver.init
index dc38754..9ac13b0 100644
--- a/conserver.init
+++ b/conserver.init
@@ -19,13 +19,18 @@ case "$1" in
   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