Der pppd wurde einfach gekillt, auch wenn er noch die Verbindung beendet hat.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@908 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/src/initscripts/init.d/connectd b/src/initscripts/init.d/connectd
index b9f0ebb6ad28c469df3ff1d05ad725bff126b179..df959e085c30a7be804567efcc473549358e2f09 100644 (file)
--- a/src/initscripts/init.d/connectd
+++ b/src/initscripts/init.d/connectd
@@ -80,10 +80,11 @@ case "$1" in
                
   reconnect)
                while ( ps ax | grep -q [p]ppd ); do
+                       msg_log "There is a pppd still running. Waiting 2 seconds for exit."
                        sleep 2
                done
                
-               /etc/rc.d/init.d/network restart red &
+               /etc/rc.d/init.d/network restart red
                ;;
                
   *)

diff --git a/src/initscripts/init.d/functions b/src/initscripts/init.d/functions
index f9a75b6e2255d77156c169a824b752b8ac753e02..3a759525f57f5c3cd741965818706380466fd17d 100644 (file)
--- a/src/initscripts/init.d/functions
+++ b/src/initscripts/init.d/functions
@@ -22,7 +22,7 @@ export PATH="/bin:/usr/bin:/sbin:/usr/sbin"
 RELOADSIG="HUP"
 
 # Number of seconds between STOPSIG and FALLBACK when stopping processes
-KILLDELAY="3"
+KILLDELAY="5"
 
 ## Screen Dimensions
 # Find current screen size

diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red
index 5052b6775fa2780cb00434526c67d44c0372cedf..30cb864c3e4bbb3aaaf3b7f703d9b32d6a11d20f 100644 (file)
--- a/src/initscripts/init.d/networking/red
+++ b/src/initscripts/init.d/networking/red
@@ -295,7 +295,9 @@ case "${1}" in
                elif [ "$TYPE" == "PPPOE" ]; then
                        boot_mesg "Bringing down the PPPoE interface on ${DEVICE}..."
                        rm -f /var/ipfire/red/keepconnected
-                       killproc /usr/sbin/pppd
+                       kill -TERM /usr/sbin/pppd 2>/dev/null
+                       evaluate_retval
+                       sleep 5
                        
                        ip addr del 1.1.1.1/24 broadcast 1.1.1.255 dev ${DEVICE}