X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=exim.init;h=f11f6e8372eba37af5e655194b2f9db00082a3dc;hb=4a6bd5403b9c11f6ad0ac31220390e04c90b4cae;hp=ebbc1dca85583c37650167da0169533cb79efaf8;hpb=5695d5514d464624ebb8cad40f515885403003ff;p=packages%2Fexim-lite.git

diff --git a/exim.init b/exim.init
index ebbc1dc..f11f6e8 100644
--- a/exim.init
+++ b/exim.init
@@ -16,18 +16,23 @@
 . /etc/sysconfig/network
 
 # Source exim configureation.
-if [ -f /etc/sysconfig/exim ] ; then
+if [ -f /etc/sysconfig/exim ]; then
 	. /etc/sysconfig/exim
 else
 	QUEUE=1h
 fi
 
 # Check that networking is up.
-if is_no "${NETWORKING}"; then
-	msg_Network_Down Exim
-	exit 1
+if is_yes "${NETWORKING}"; then
+	if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
+		msg_network_down Exim
+		exit 1
+	fi
+else
+	exit 0
 fi
 
+RETVAL=0
 # See how we were called.
 case "$1" in
   start)
@@ -40,7 +45,7 @@ case "$1" in
 		RETVAL=$?
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/exim
 	else
-		msg_Already_Running Exim
+		msg_already_running Exim
 	fi
 	;;
   stop)
@@ -50,25 +55,31 @@ case "$1" in
 		killproc exim
 		rm -f /var/lock/subsys/exim >/dev/null 2>&1
 	else
-		msg_Not_Running Exim
-		exit 1
+		msg_not_running Exim
 	fi	
 	;;
   restart)
 	$0 stop
 	$0 start
+	exit $?
 	;;
   status)
 	status exim
+	exit $?
 	;;
-  reload)
-	msg_reloading Exim
-	killproc exim -HUP
+  reload|force-reload)
+	if [ -f /var/lock/subsys/exim ]; then
+		msg_reloading Exim
+		killproc exim -HUP
+		RETVAL=$?
+	else
+		msg_not_running Exim >&2
+		exit 7
+	fi
 	;;
   *)
-	msg_Usage "$0 {start|stop|restart|reload|status}"
-	exit 1
+	msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
+	exit 3
 esac
 
 exit $RETVAL
-