OpenSwan-Build-Fix.

[people/teissler/ipfire-2.x.git] / src / initscripts / init.d / net / red / pppoe

diff --git a/src/initscripts/init.d/net/red/pppoe b/src/initscripts/init.d/net/red/pppoe
index 199164a71e5f0a88977c9326645ffecebfa302bb..8c3493c265af3d84f4637d117b7c6cd748be9be7 100644 (file)
--- a/src/initscripts/init.d/net/red/pppoe
+++ b/src/initscripts/init.d/net/red/pppoe
@@ -42,7 +42,7 @@ case "${2}" in
                        fi
                        
                        if [ "${RECONNECTION}" != "persistent" ]; then
-                               if [ "${TIMEOUT}" != "0" ]; then
+                               if [ "${TIMEOUT}" != "0" ] && [ "${TIMEOUT}" != "" ]; then
                                        SECONDS=$[${TIMEOUT} * 60]
                                        ARGS+=" idle ${SECONDS}"
                                fi
@@ -113,7 +113,7 @@ case "${2}" in
                boot_mesg "Bringing down the PPPoE interface on ${1}..."
                
                modprobe -r pppoe >/dev/null 2>&1
-               kill $(cat /var/run/pppd-ipfire.pid)
+               kill $(head -1 /var/run/ppp-ipfire.pid)
                sleep 2
                ip addr del 1.1.1.1/24 broadcast 1.1.1.255 dev ${1}