e492c8c
diff -up freeradius-1.1.7/redhat/rc.radiusd-redhat.lsb freeradius-1.1.7/redhat/rc.radiusd-redhat
e492c8c
--- freeradius-1.1.7/redhat/rc.radiusd-redhat.lsb	2002-09-14 01:13:58.000000000 +0200
ea5b30d
+++ freeradius-1.1.7/redhat/rc.radiusd-redhat	2007-09-17 17:20:07.000000000 +0200
e492c8c
@@ -20,6 +20,14 @@
e492c8c
 #    Copyright (C) 2001 The FreeRADIUS Project   http://www.freeradius.org
e492c8c
 #
e492c8c
 
e492c8c
+### BEGIN INIT INFO
e492c8c
+# Provides: RADIUS server daemon
e492c8c
+# Required-Start: $local_fs $network
e492c8c
+# Required-Stop: $local_fs $network
e492c8c
+# Short-Description: start and stop RADIUS server daemon
e492c8c
+# Description: radiusd - Authentication, Authorization and Accounting server
e492c8c
+### END INIT INFO
e492c8c
+
e492c8c
 # Source function library.
e492c8c
 . /etc/rc.d/init.d/functions
e492c8c
 
e492c8c
@@ -27,13 +35,17 @@ RADIUSD=/usr/sbin/radiusd
e492c8c
 LOCKF=/var/lock/subsys/radiusd
e492c8c
 CONFIG=/etc/raddb/radiusd.conf
e492c8c
 
e492c8c
-[ -f $RADIUSD ] || exit 0
e492c8c
-[ -f $CONFIG ] || exit 0
e492c8c
+[ -f $RADIUSD ] || exit 5
e492c8c
+[ -f $CONFIG ] || exit 6
e492c8c
 
e492c8c
 RETVAL=0
e492c8c
 
e492c8c
+status radiusd
e492c8c
+running=$?
e492c8c
+
e492c8c
 case "$1" in
e492c8c
   start)
e492c8c
+	[ $running -eq 0 ] && exit 0
e492c8c
 	echo -n $"Starting RADIUS server: "
e492c8c
 	daemon $RADIUSD -y
e492c8c
 	RETVAL=$?
e492c8c
@@ -42,6 +54,7 @@ case "$1" in
e492c8c
 	    ln -s /var/run/radiusd/radiusd.pid /var/run/radiusd.pid 2>/dev/null
e492c8c
 	;;
e492c8c
   stop)
632cefe
+	[ $running -eq 0 ] || exit 0
e492c8c
 	echo -n $"Stopping RADIUS server: "
e492c8c
 	killproc $RADIUSD
e492c8c
 	RETVAL=$?
e492c8c
@@ -53,28 +66,28 @@ case "$1" in
e492c8c
 	RETVAL=$?
e492c8c
         ;;
e492c8c
   reload)
632cefe
+	[ $running -eq 0 ] || exit 7
e492c8c
 	echo -n $"Reloading RADIUS server: "
e492c8c
 	killproc $RADIUSD -HUP
e492c8c
 	RETVAL=$?
e492c8c
 	echo
e492c8c
 	;;
e492c8c
-  restart)
e492c8c
+  restart|force-reload)
e492c8c
 	$0 stop
e492c8c
 	sleep 3
e492c8c
 	$0 start
e492c8c
 	RETVAL=$?
e492c8c
 	;;
e492c8c
-  condrestart)
e492c8c
-	if [ -f $LOCKF ]; then
e492c8c
-		$0 stop
e492c8c
-		sleep 3
e492c8c
-		$0 start
e492c8c
-		RETVAL=$?
e492c8c
-	fi
e492c8c
+  condrestart|try-restart)
ea5b30d
+	[ $running -eq 0 ] || exit 0
e492c8c
+	$0 stop
e492c8c
+	sleep 3
e492c8c
+	$0 start
e492c8c
+	RETVAL=$?
e492c8c
 	;;
e492c8c
   *)
e492c8c
 	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
e492c8c
-	exit 1
ea5b30d
+	RETVAL=2
e492c8c
 esac
e492c8c
 
e492c8c
 exit $RETVAL