- rel 4

[packages/freeradius.git] / freeradius.init

diff --git a/freeradius.init b/freeradius.init
index 6e24cbcddeb8c0460057820e1d726e4d8edc0ed9..ad85a3c83bcc1b7df39c8811215cb98002f2b537 100644 (file)
--- a/freeradius.init
+++ b/freeradius.init
@@ -23,58 +23,60 @@
 # Source function library.
 . /etc/rc.d/init.d/functions
 
-RADIUSD=/usr/sbin/radiusd
-LOCKF=/var/lock/subsys/radiusd
-CONFIG=/etc/raddb/radiusd.conf
+[ -f /etc/raddb/radiusd.conf ] || exit 0
 
-[ -f "$RADIUSD" ] || exit 0
-[ -f "$CONFIG" ] || exit 0
-
-RETVAL=0
-case "$1" in
-  start)
+start() {
        # Check if the service is already running?
-       if [ ! -f "$LOCKF" ]; then
+       if [ ! -f /var/lock/subsys/freeradius ]; then
                msg_starting RADIUS
-               daemon "$RADIUSD"
+               daemon /usr/sbin/radiusd
                RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch "$LOCKF"
+               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/freeradius
        else
                msg_already_running RADIUS
        fi
-       ;;
-  stop)
+}
+
+stop() {
        # Stop daemons.
-       if [ -f "$LOCKF" ]; then
+       if [ -f /var/lock/subsys/freeradius ]; then
                msg_stopping RADIUS
-               killproc "$RADIUSD"
-               rm -f "$LOCKF" > /dev/null 2>&1
+               killproc /usr/sbin/radiusd
+               rm -f /var/lock/subsys/freeradius > /dev/null 2>&1
        else
                msg_not_running RADIUS
        fi
+}
+
+RETVAL=0
+case "$1" in
+  start)
+       start
+       ;;
+  stop)
+       stop
        ;;
   status)
        status radiusd
        exit $?
        ;;
   reload)
-       if [ -f "$LOCKF" ]; then
+       if [ -f /var/lock/subsys/freeradius ]; then
                msg_reloading RADIUS
-               killproc "$RADIUSD" -HUP
+               killproc /usr/sbin/radiusd -HUP
                RETVAL=$?
        else
-               msg_not_running RADIUS >&2
+               msg_not_running RADIUS
                exit 7
        fi
        ;;
   restart|force-reload)
-       $0 stop
+       stop
        sleep 3
-       $0 start
-       RETVAL=$?
+       start
        ;;
 #  condrestart)
-#      if [ -f $LOCKF ]; then
+#      if [ -f /var/lock/subsys/freeradius ]; then
 #              $0 stop
 #              sleep 3
 #              $0 start