From 66db90757a750afd3843d432b095943d342b8ce7 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 23 Mar 2024 16:55:41 +0100
Subject: [PATCH] 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>
---
 config/cfgroot/header.pl        |  4 +---
 src/initscripts/networking/red  | 17 ++++-------------
 src/initscripts/system/connectd |  4 ----
 3 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
index 68c3cb838..9b35c55b1 100644
--- 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 51bf95a43..1e4116097 100644
--- 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 5ab186108..d956c2847 100644
--- 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)[$$] $*
 }
-- 
2.39.5