From be40a5b126855d70d917981f60e84aec1a9385d2 Mon Sep 17 00:00:00 2001
From: Christian Schmidt <maniacikarus@ipfire.org>
Date: Sat, 16 Jan 2010 16:21:56 +0100
Subject: [PATCH] Revert "Fixed connscheduler reconnecting even if not pppoe."

This reverts commit b68117f5eb732adb42167c42f69d05070d099f9e.

We will realise this by generaly disable reconnect for all.
---
 config/cfgroot/connscheduler.conf        |  2 +-
 config/rootfiles/core/35/filelists/files |  2 --
 src/scripts/connscheduler                | 37 +-----------------------
 3 files changed, 2 insertions(+), 39 deletions(-)

diff --git a/config/cfgroot/connscheduler.conf b/config/cfgroot/connscheduler.conf
index 379ac92453..9bcf1955d5 100644
--- a/config/cfgroot/connscheduler.conf
+++ b/config/cfgroot/connscheduler.conf
@@ -1 +1 @@
-on,reconnect,,05:00,weekdays,,Mon Tue Wed Thu Fri Sat Sun ,,MorningReconnect for pppoe
+on,reconnect,,05:00,weekdays,,Mon Tue Wed Thu Fri Sat Sun ,,MorningReconnect
diff --git a/config/rootfiles/core/35/filelists/files b/config/rootfiles/core/35/filelists/files
index a6bf811153..15fca78431 100644
--- a/config/rootfiles/core/35/filelists/files
+++ b/config/rootfiles/core/35/filelists/files
@@ -13,5 +13,3 @@ lib/modules/2.6.27.42-ipfire-xen/kernel/net/ieee80211/ieee80211_crypt_tkip.off
 lib/modules/2.6.27.42-ipfire-xen/kernel/net/ieee80211/ieee80211_crypt_wep.off
 srv/web/ipfire/cgi-bin/outgoingfw.cgi
 var/ipfire/outgoing/bin/outgoingfw.pl
-usr/local/bin/connscheduler
-var/ipfire/connscheduler/connscheduler.conf
diff --git a/src/scripts/connscheduler b/src/scripts/connscheduler
index ceb411601e..bc4d4eb656 100644
--- a/src/scripts/connscheduler
+++ b/src/scripts/connscheduler
@@ -21,9 +21,6 @@ $weekday = ($weekday + 6) % 7;
 # get the closest thing possible
 $minute = int($minute / 5) * 5;
 
-my $swroot = "/var/ipfire";
-my %ethernetsettings;
-&readhash("${swroot}/ethernet/settings", \%ethernetsettings);
 
 if ( $ARGV[0] eq 'hangup' )
 {
@@ -120,11 +117,7 @@ sub dial
 
 
 sub reconnect
-{ 
-  if ( $ethernetsettings{'RED_TYPE'} ne 'PPPOE' ){
-	  &General::log("ConnSched skipped because not running pppoe");
-	  exit;
-  }
+{
   &hangup() if ( -e "${General::swroot}/red/active" );
   # now wait for active triggerfile and ppp daemon to disappear
   # wait maximum 60 seconds
@@ -249,31 +242,3 @@ sub timer
     }
   }
 }
-
-sub readhash
-{
-	my $filename = $_[0];
-	my $hash = $_[1];
-	my ($var, $val);
-
-	if (-e $filename)
-	{
-		open(FILE, $filename) or die "Unable to read file $filename";
-		while (<FILE>)
-		{
-			chop;
-			($var, $val) = split /=/, $_, 2;
-			if ($var)
-			{
-				$val =~ s/^\'//g;
-				$val =~ s/\'$//g;
-	
-				# Untaint variables read from hash
-				$var =~ /([A-Za-z0-9_-]*)/;        $var = $1;
-				$val =~ /([\w\W]*)/; $val = $1;
-				$hash->{$var} = $val;
-			}
-		}
-		close FILE;
-	}
-}
\ No newline at end of file
-- 
2.39.2