X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=dnsmasq.init;h=c744ab2b24ca61cc9ea0f28228fba46b5c34790d;hb=40d90f98abb620dee60eb42507e5f442ad3a959a;hp=af22f00db3d912c162e5836754c297003af3aa2f;hpb=ae7f99d1cd96a35474d34c6244ac2b0bf5207b22;p=packages%2Fdnsmasq.git

diff --git a/dnsmasq.init b/dnsmasq.init
index af22f00..c744ab2 100644
--- a/dnsmasq.init
+++ b/dnsmasq.init
@@ -20,9 +20,13 @@ CMD=$SERVICE
 . /etc/sysconfig/network
 
 # Check that networking is up
-if is_no "$NETWORKING"; then
-	msg_network_down $MSG
-	exit 1
+if is_yes "${NETWORKING}"; then
+	if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
+		msg_network_down $MSG
+		exit 1
+	fi
+else
+	exit 0
 fi
 
 MAILHOSTNAME=""
@@ -39,7 +43,9 @@ OPTIONS=""
 [ -n "$RESOLV_CONF" ] && OPTIONS="$OPTIONS -r $RESOLV_CONF"
 [ -n "$DHCP_LEASE" ] && OPTIONS="$OPTIONS -l $DHCP_LEASE"
 [ -n "$DOMAIN_SUFFIX" ] && OPTIONS="$OPTIONS -s $DOMAIN_SUFFIX"
+[ -n "$INTERFACE" ] && OPTIONS="$OPTIONS -i $INTERFACE"
 
+RETVAL=0
 # See how we were called.
 case "$1" in
   start)
@@ -50,7 +56,6 @@ case "$1" in
 		[ $RETVAL -eq 0 ] && touch $LOCKFILE
 	else
 		msg_already_running $MSG
-		exit 1
 	fi
 	;;
   stop)
@@ -60,20 +65,19 @@ case "$1" in
 		rm -f $LOCKFILE  >/dev/null 2>&1
 	else
 		msg_not_running $MSG
-		exit 1
 	fi
 	;;
   status)
 	status $CMD
-	exit $?
 	;;
-  restart|reload)
+  restart|force-reload)
 	$0 stop
 	$0 start
+	exit $?
 	;;
   *)
-	msg_usage "$0 {start|stop|restart|reload|status}"
-	exit 1
+	msg_usage "$0 {start|stop|restart|force-reload|status}"
+	exit 3
 esac
 
 exit $RETVAL