New initscript that use the LSB start_daemon, killproc and log_*

	functions instead of calling directly the start-stop-daemon
	utility from Debian.

	Force Depends on lsb-base (>= 3.1-23.2) for bug #434756.

diff --git a/debian/freeradius.init b/debian/freeradius.init
index 4284e85..e90c5e7 100755 (executable)
--- a/debian/freeradius.init
+++ b/debian/freeradius.init
@@ -8,61 +8,102 @@
 # Required-Stop:
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
+# Short-Description: FreeRADIUS server
+# Description:       Extensible, configurable, high performance RADIUS server.
 ### END INIT INFO
 
-PROG="freeradius"
-PROGRAM="/usr/sbin/freeradius"
-PIDFILE="/var/run/freeradius/freeradius.pid"
-DESCR="FreeRADIUS daemon"
+# Do NOT "set -e"
 
-test -f $PROGRAM || exit 0
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="FreeRADIUS server"
+NAME=freeradius
+DAEMON=/usr/sbin/$NAME
+PIDFILE=/var/run/$NAME/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+
+# Default values for config variables
+FR_USER=freerad
+FR_GROUP=freerad
+FR_ARGS=
+
+# Exit if the package is not installed
+[ -x $DAEMON ] || exit 0
+
+# Read configuration variable file if it is present
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB start_daemon, killproc and log_* functions.
+. /lib/lsb/init-functions
 
 # /var/run may be a tmpfs
-if [ ! -d /var/run/freeradius ]; then
-       install -o freerad -g freerad -m 0755 -d /var/run/freeradius
+if [ ! -d /var/run/$NAME ]; then
+       install -o "$FR_USER" -g "$FR_GROUP" -m 0755 -d /var/run/$NAME
        if [ $? -ne 0 ]; then
-               echo "Error creating the /var/run/freeradius directory."
+               echo "Error creating the /var/run/$NAME directory."
                exit 1
        fi
 fi
 
 case "$1" in
-       start)
-               echo -n "Starting $DESCR: "
-               start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $PROGRAM
-               if [ $? -eq 0 ]; then
-                       echo "$PROG."
-               else
-                       echo "(failed!  run '$PROGRAM -X' to find out why.)"
-                       exit 1
-               fi
-               ;;
-       stop)
-               echo -n "Stopping $DESCR: "
-               start-stop-daemon --stop --retry=TERM/30/KILL/5 --oknodo --quiet --pidfile $PIDFILE
-               echo "$PROG."
-               ;;
-       restart)
-               echo "Restarting $DESCR..."
-               $0 stop
-               $0 start
-               ;;
-       reload | force-reload)
-               echo -n "Reloading configuration files for $DESCR"
-               start-stop-daemon --stop --signal 1 --oknodo --quiet --pidfile $PIDFILE
-               sleep 2
-               [ -r $PIDFILE ] && kill -0 $(cat $PIDFILE) > /dev/null 2>&1
-               if [ $? -eq 0 ]; then
-                       echo "."
-               else
-                       echo " failed! ($PROG has died)"
-                       exit 1
-               fi
-               ;;
-       *)
-               echo "Usage: $0 start|stop|restart|reload|force-reload"
+  start)
+       [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
+       start_daemon -p $PIDFILE $DAEMON $FR_ARGS
+       if [ $? -ne 0 ]; then
+               [ "$VERBOSE" != no ] && log_end_msg 1 || \
+               log_failure_msg "Run '$DAEMON -X' to find out why."
+               exit 1
+       fi
+       [ "$VERBOSE" != no ] && log_end_msg 0
+       ;;
+  stop)
+       [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+       killproc -p $PIDFILE $DAEMON
+       if [ $? -ne 0 ]; then
+               [ "$VERBOSE" != no ] && log_end_msg 1
+               exit 1
+       fi
+       [ "$VERBOSE" != no ] && log_end_msg 0
+       ;;
+  restart)
+       log_daemon_msg "Restarting $DESC" "$NAME"
+       killproc -p $PIDFILE $DAEMON
+       if [ $? -ne 0 ]; then
+               log_end_msg 1
+               log_failure_msg "Failed to stop $NAME."
+               exit 1
+       fi
+       start_daemon -p $PIDFILE $DAEMON $FR_ARGS
+       if [ $? -ne 0 ]; then
+               log_end_msg 1
+               log_failure_msg "Failed to start $NAME."
+               log_failure_msg "Run '$DAEMON -X' to find out why."
                exit 1
-               ;;
+       fi
+       log_end_msg 0
+       ;;
+  reload|force-reload)
+       log_daemon_msg "Reloading $DESC" "$NAME"
+       killproc -p $PIDFILE $DAEMON -SIGHUP
+       if [ $? -ne 0 ]; then
+               log_end_msg 1
+               exit 1
+       fi
+       sleep 2
+       pidofproc -p $PIDFILE > /dev/null
+       if [ $? -ne 0 ]; then
+               log_end_msg 1
+               log_failure_msg "$NAME has died."
+               exit 1
+       fi
+       log_end_msg 0
+       ;;
+  *)
+       echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
+       exit 3
+       ;;
 esac
 
 exit 0