- initscript: one kill is really enough, different versions came from template; add...

Changed files:
    accel-ppp.init -> 1.7
    accel-ppp.spec -> 1.8

diff --git a/accel-ppp.init b/accel-ppp.init
index 4b3499683a35a1bb001a0c4f9f92bad82ea56a35..f11e150f8bcba7f70be7aede88182f18b65bbd90 100644 (file)
--- a/accel-ppp.init
+++ b/accel-ppp.init
@@ -8,8 +8,9 @@
 #
 # processname: accel-pppd
 # config:      /etc/accel-ppp.conf
 #
 # processname: accel-pppd
 # config:      /etc/accel-ppp.conf

-# pidfile:     /var/run/accel-ppp/accel-ppp.pid        
+# pidfile:     /var/run/accel-ppp/accel-ppp.pid

 #
 #

+# $Id$

 #
 # Source function library
 . /etc/rc.d/init.d/functions
 #
 # Source function library
 . /etc/rc.d/init.d/functions


@@ -57,7 +58,6 @@ stop() {
 
        # Stop daemons.
        msg_stopping "accel-pppd"
 
        # Stop daemons.
        msg_stopping "accel-pppd"

-       killproc accel-pppd

        killproc --pidfile $pidfile accel-pppd -TERM
        rm -f /var/lock/subsys/accel-ppp
 }
        killproc --pidfile $pidfile accel-pppd -TERM
        rm -f /var/lock/subsys/accel-ppp
 }


@@ -70,7 +70,6 @@ reload() {
        fi
 
        msg_reloading "accel-pppd"
        fi
 
        msg_reloading "accel-pppd"

-       killproc accel-pppd -HUP

        killproc --pidfile $pidfile accel-pppd -HUP
        RETVAL=$?
 }
        killproc --pidfile $pidfile accel-pppd -HUP
        RETVAL=$?
 }


@@ -102,11 +101,13 @@ case "$1" in
   try-restart)
        condrestart 0
        ;;
   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
        ;;
 # 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
 # use this one if program doesn't support reloading without restart
   force-reload)
        condrestart 7

diff --git a/accel-ppp.spec b/accel-ppp.spec
index 09625951e1aabc040063e5bdc13aa28055899899..e034b02d1e1064ce2fd3ca6e7b0bf193f798d3e0 100644 (file)
--- a/accel-ppp.spec
+++ b/accel-ppp.spec
@@ -2,6 +2,7 @@
 # - check accel-ppp.tmpfiles
 # - logrotate archivedir
 # - add bconds
 # - check accel-ppp.tmpfiles
 # - logrotate archivedir
 # - add bconds

+# - initscript: remove duplicate force-reload, remove one depending whether it supports reload or not

 #
 Summary:       High performance PPTP/L2TP/PPPoE server
 Name:          accel-ppp
 #
 Summary:       High performance PPTP/L2TP/PPPoE server
 Name:          accel-ppp