Author: qboosh                       Date: Fri Oct 24 16:12:14 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fixed force-reload (=reload in this case), added try-restart

---- Files affected:
SOURCES:
   freeradius.init (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: SOURCES/freeradius.init
diff -u SOURCES/freeradius.init:1.11 SOURCES/freeradius.init:1.12
--- SOURCES/freeradius.init:1.11        Fri Oct 24 12:10:47 2008
+++ SOURCES/freeradius.init     Fri Oct 24 18:12:08 2008
@@ -48,19 +48,34 @@
        fi
 }
 
+condrestart() {
+       if [ -f /var/lock/subsys/freeradius ]; then
+               stop
+               sleep 3
+               start
+       else
+               msg_not_running RADIUS
+               RETVAL=$1
+       fi
+}
+
 RETVAL=0
 case "$1" in
   start)
-       start
+       start
        ;;
   stop)
-       stop
+       stop
        ;;
-  status)
-       status radiusd
-       exit $?
+  restart)
+       stop
+       sleep 3
+       start
+       ;;
+  try-restart)
+       condrestart 0
        ;;
-  reload)
+  reload|force-reload)
        if [ -f /var/lock/subsys/freeradius ]; then
                msg_reloading RADIUS
                killproc /usr/sbin/radiusd -HUP
@@ -70,21 +85,12 @@
                exit 7
        fi
        ;;
-  restart|force-reload)
-       stop
-       sleep 3
-       start
+  status)
+       status radiusd
+       exit $?
        ;;
-#  condrestart)
-#      if [ -f /var/lock/subsys/freeradius ]; then
-#              $0 stop
-#              sleep 3
-#              $0 start
-#              RETVAL=$?
-#      fi
-#      ;;
   *)
-       msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
+       msg_usage "$0 
{start|stop|restart|try-restart|reload|force-reload|status}"
        exit 3
 esac
 
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/freeradius.init?r1=1.11&r2=1.12&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to