SOURCES: freeradius-server.init - checkconfig added; start+stop=100

blues blues at pld-linux.org
Wed Nov 26 12:28:58 CET 2008


Author: blues                        Date: Wed Nov 26 11:28:58 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- checkconfig added; start+stop=100

---- Files affected:
SOURCES:
   freeradius-server.init (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/freeradius-server.init
diff -u SOURCES/freeradius-server.init:1.1 SOURCES/freeradius-server.init:1.2
--- SOURCES/freeradius-server.init:1.1	Sat Apr 12 09:40:48 2008
+++ SOURCES/freeradius-server.init	Wed Nov 26 12:28:52 2008
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# chkconfig:	345 88 10
+# chkconfig:	345 88 12
 # description:	Start/Stop the RADIUS server daemon
 #
 #    This program is free software; you can redistribute it and/or modify
@@ -25,6 +25,10 @@
 
 [ -f /etc/raddb/radiusd.conf ] || exit 0
 
+checkconfig() {
+	run_cmd "Checking RADIUS configuration " /usr/sbin/radiusd -C || exit 1
+}
+
 start() {
 	# Check if the service is already running?
 	if [ ! -f /var/lock/subsys/freeradius ]; then
@@ -58,10 +62,12 @@
 	;;
   status)
 	status radiusd
+	checkconfig
 	exit $?
 	;;
   reload)
 	if [ -f /var/lock/subsys/freeradius ]; then
+		checkconfig
 		msg_reloading RADIUS
 		killproc /usr/sbin/radiusd -HUP
 		RETVAL=$?
@@ -71,15 +77,17 @@
 	fi
 	;;
   restart|force-reload)
+  	checkconfig
 	stop
 	sleep 3
 	start
 	;;
   condrestart)
 	if [ -f /var/lock/subsys/freeradius ]; then
-		$0 stop
+		checkconfig
+		stop
 		sleep 3
-		$0 start
+		start
 		RETVAL=$?
 	fi
 	;;
================================================================

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



More information about the pld-cvs-commit mailing list