Remove RECONNECTION=dialondemand

We don't support this at all and so we don't need to check any more.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
index 68c3cb8387f25a1eace4a9e34df81dade58651fe..9b35c55b1e4378da2da01f3c22cd8753343b663b 100644 (file)
--- a/config/cfgroot/header.pl
+++ b/config/cfgroot/header.pl
@@ -623,10 +623,8 @@ sub connectionstatus
                        $timestr = &General::age("${General::swroot}/red/active");
                        $connstate = "<span>$Lang::tr{'connected'} - (<span>$timestr</span>) $profileused</span>";
                } else {
-                 if ((open(KEEPCONNECTED, "</var/ipfire/red/keepconnected") == false) && ($Network::ppp{'RECONNECTION'} eq "persistent")) {
+                 if (open(KEEPCONNECTED, "</var/ipfire/red/keepconnected") == false) {
                                $connstate = "<span>$Lang::tr{'connection closed'} $profileused</span>";
-      } elsif (($Network::ppp{'RECONNECTION'} eq "dialondemand") && ( -e "${General::swroot}/red/dial-on-demand")) {
-                               $connstate = "<span>$Lang::tr{'dod waiting'} $profileused</span>";
                        } else {
                                $connstate = "<span>$Lang::tr{'connecting'} $profileused</span>" if (system("ps -ef | grep -q '[p]ppd'"));
                        }

diff --git a/src/initscripts/networking/red b/src/initscripts/networking/red
index 51bf95a4362a0113732cbc3019288d45f04ad6cb..1e411609742f59269ba0012b6cfc208f21675500 100644 (file)
--- a/src/initscripts/networking/red
+++ b/src/initscripts/networking/red
@@ -402,19 +402,10 @@ case "${1}" in
                                AUTH=""
                        fi
 
-                       ### Dial On Demand
-                       #
-                       if [ "${RECONNECTION}" != "persistent" ]; then
-                               if [ "${TIMEOUT}" != "0" ] && [ "${TIMEOUT}" != "" ]; then
-                                       SECONDS=$[${TIMEOUT} * 60]
-                               else
-                                       SECONDS=300
-                               fi
-                               if [ "${RECONNECTION}" == "dialondemand" ]; then
-                                       touch /var/ipfire/red/dial-on-demand
-                                       DEMAND="demand persist idle ${SECONDS} 10.112.112.112:10.112.112.113"
-                                       DEMAND+=" ipcp-accept-remote ipcp-accept-local noipdefault ktune"
-                               fi
+                       if [ "${TIMEOUT}" != "0" ] && [ "${TIMEOUT}" != "" ]; then
+                               SECONDS=$[${TIMEOUT} * 60]
+                       else
+                               SECONDS=300
                        fi
 
                        if [ "$TYPE" == "pppoe" ]; then

diff --git a/src/initscripts/system/connectd b/src/initscripts/system/connectd
index 5ab1861089150e0d54484c6c73e4a75f70682d19..d956c2847aac542770e568580b4038d6e77a8e10 100644 (file)
--- a/src/initscripts/system/connectd
+++ b/src/initscripts/system/connectd
@@ -36,10 +36,6 @@ if [ ! $HOLDOFF ]; then
        HOLDOFF=30
 fi
 
-if [ "$RECONNECTION" = "dialondemand" ]; then
-       exit 0
-fi
-
 msg_log () {
        logger -t $(basename $0)[$$] $*
 }