X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=net-snmptrapd.init;h=eb97ffd58c6a4cdfd22b8d6bf6cb2b0f90fbd504;hb=f26abd0c2ae7fbe0045aa3e827da0b4213eb9eac;hp=944f7f3408b8315c8d561cc529921ae6582bd4c7;hpb=04a4ae2463d031b254fabb2a1efa15d71118f505;p=packages%2Fnet-snmp.git

diff --git a/net-snmptrapd.init b/net-snmptrapd.init
index 944f7f3..eb97ffd 100644
--- a/net-snmptrapd.init
+++ b/net-snmptrapd.init
@@ -17,12 +17,15 @@
 # Get network config
 . /etc/sysconfig/network
 
+# Define initial value:
+SNMPTRAPD_OPTIONS=""
+
 # Get service config
 [ -f /etc/sysconfig/snmpd ] && . /etc/sysconfig/snmptrapd
 
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
-	if [ ! -f /var/lock/subsys/network ]; then
+	if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
 		msg_network_down "snmptrapd"
 		exit 1
 	fi
@@ -30,40 +33,63 @@ else
 	exit 0
 fi
 
-RETVAL=0
-# See how we were called.
-case "$1" in
-  start)
+start() {
 	# Check if the service is already running?
 	if [ ! -f /var/lock/subsys/snmptrapd ]; then
 		msg_starting "snmptrapd"
-		daemon /usr/sbin/snmptrapd
+		daemon /usr/sbin/snmptrapd $SNMPTRAPD_OPTIONS
 		RETVAL=$?
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/snmptrapd
 	else
 		msg_already_running "snmptrapd"
 	fi
-	;;
-  stop)
+}
+
+stop() {
 	if [ -f /var/lock/subsys/snmptrapd ]; then
 		msg_stopping "snmptrapd"
 		killproc snmptrapd
 		rm -f /var/lock/subsys/snmptrapd >/dev/null 2>&1
 	else
 		msg_not_running "snmptrapd"
-	fi	
+	fi
+}
+
+condrestart() {
+	if [ -f /var/lock/subsys/snmptrapd ]; then
+		stop
+		start
+	else
+		msg_not_running "snmptrapd"
+		RETVAL=$1
+	fi
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+  	start
 	;;
-  restart|force-reload)
-	$0 stop
-	$0 start
-	exit $?
+  stop)
+  	stop
+	;;
+  restart)
+	stop
+	start
+	;;
+  try-restart)
+	condrestart 0
+	;;
+  force-reload)
+	condrestart 7
 	;;
   status)
 	status snmptrapd
 	exit $?
 	;;
   *)
-	msg_usage "$0 {start|stop|restart|force-reload|status}"
+	msg_usage "$0 {start|stop|restart|try-restart|force-reload|status}"
 	exit 3
 esac