- updated to 1.8.0

[packages/accel-ppp.git] / accel-ppp.init

diff --git a/accel-ppp.init b/accel-ppp.init
index 1218cef4c0fe9f99185e12ae7598f31dfb6987ce..f11e150f8bcba7f70be7aede88182f18b65bbd90 100644 (file)
--- a/accel-ppp.init
+++ b/accel-ppp.init
@@ -8,10 +8,10 @@
 #
 # processname: accel-pppd
 # config:      /etc/accel-ppp.conf
-# pidfile:     
+# pidfile:     /var/run/accel-ppp/accel-ppp.pid
+#
+# $Id$
 #
-# $Id: 
-
 # Source function library
 . /etc/rc.d/init.d/functions
 
@@ -28,53 +28,10 @@ else
        exit 0
 fi
 
-# Set defaults
-OPTION1=""     # Strings
-OPTION2="-q"   #
-OPTION3=       # Values
-OPTION4=5      #
-
 # Get service config - may override defaults
 [ -f /etc/sysconfig/accel-ppp ] && . /etc/sysconfig/accel-ppp
 
-pidfile="/var/run/accel-ppp.pid"
-
-# configtest itself
-# must return non-zero if check failed
-# output is discarded if checkconfig is ran without details
-configtest() {
-       /usr/sbin/accel-pppd -t
-       return $?
-}
-
-# wrapper for configtest
-checkconfig() {
-       local details=${1:-0}
-
-       if [ $details = 1 ]; then
-               # run config test and display report (status action)
-               show "Checking %s configuration" "accel-ppp"; busy
-               local out
-               out=$(configtest 2>&1)
-               RETVAL=$?
-               if [ $RETVAL = 0 ]; then
-                       ok
-               else
-                       fail
-               fi
-               [ "$out" ] && echo >&2 "$out"
-       else
-               # run config test and abort with nice message if failed
-               # (for actions checking status before action).
-               configtest >/dev/null 2>&1
-               RETVAL=$?
-               if [ $RETVAL != 0 ]; then
-                       show "Checking %s configuration" "accel-ppp"; fail
-                       nls 'Configuration test failed. See details with %s "checkconfig"' $0
-                       exit $RETVAL
-               fi
-       fi
-}
+pidfile="/var/run/accel-ppp/accel-ppp.pid"
 
 start() {
        # Check if the service is already running?
@@ -83,9 +40,12 @@ start() {
                return
        fi
 
-       checkconfig
+       if [ ! -f /var/run/accel-ppp/seq ]; then
+               echo "0" > /var/run/accel-ppp/seq
+       fi
+
        msg_starting "accel-pppd"
-       daemon /usr/sbin/accel-pppd
+       daemon /usr/sbin/accel-pppd $OPTIONS
        RETVAL=$?
        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/accel-ppp
 }
@@ -98,7 +58,6 @@ stop() {
 
        # Stop daemons.
        msg_stopping "accel-pppd"
-       killproc accel-pppd
        killproc --pidfile $pidfile accel-pppd -TERM
        rm -f /var/lock/subsys/accel-ppp
 }
@@ -110,9 +69,7 @@ reload() {
                return
        fi
 
-       checkconfig
        msg_reloading "accel-pppd"
-       killproc accel-pppd -HUP
        killproc --pidfile $pidfile accel-pppd -HUP
        RETVAL=$?
 }
@@ -124,7 +81,6 @@ condrestart() {
                return
        fi
 
-       checkconfig
        stop
        start
 }
@@ -139,31 +95,29 @@ case "$1" in
        stop
        ;;
   restart)
-       checkconfig
        stop
        start
        ;;
   try-restart)
        condrestart 0
        ;;
+# XXX: duplicate force-reload, remove one depending whether it supports reload or not
 # include force-reload here if program allows reloading without restart
 # otherwise remove reload action and support force-reload as restart if running
   reload|force-reload)
        reload
        ;;
+# XXX: duplicate force-reload, remove one depending whether it supports reload or not
 # use this one if program doesn't support reloading without restart
   force-reload)
        condrestart 7
        ;;
-  checkconfig|configtest)
-       checkconfig 1
-       ;;
   status)
-       status accel-ppp
+       status accel-pppd
        RETVAL=$?
        ;;
   *)
-       msg_usage "$0 {start|stop|restart|try-restart|reload|force-reload|checkconfig|status}"
+       msg_usage "$0 {start|stop|restart|try-restart|reload|force-reload|status}"
        exit 3
 esac