From d03daef5a4f7e0f801cc07114fbb51ada9a708f5 Mon Sep 17 00:00:00 2001 From: maniacikarus Date: Sun, 15 Jul 2007 07:58:51 +0000 Subject: [PATCH] Doch noch ein paar alte Config Types gefunden git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@689 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- src/initscripts/init.d/red | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/initscripts/init.d/red b/src/initscripts/init.d/red index 60bd45d86..ede78c0b1 100644 --- a/src/initscripts/init.d/red +++ b/src/initscripts/init.d/red @@ -97,16 +97,16 @@ if ($ARGV[0] eq 'start') { exit 1; } - if ( ( ( ($netsettings{'RED_TYPE'} =~ /^(PPPOE|PPTP)$/) && ($netsettings{'CONFIG_TYPE'} =~ /^(2|3|6|7)$/) ) || + if ( ( ( ($netsettings{'RED_TYPE'} =~ /^(PPPOE|PPTP)$/) && ($netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/) ) || ( ( ($pppsettings{'METHOD'} =~ /^(PPPOE|PPPOE_PLUGIN)$/) || ($pppsettings{'PROTOCOL'} eq 'RFC2364') ) && - ($netsettings{'CONFIG_TYPE'} =~ /^(0|1|4|5)$/) ) ) && ($pppsettings{'RECONNECTION'} ne 'manual') ) { + ($netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/) ) ) && ($pppsettings{'RECONNECTION'} ne 'manual') ) { system ('/etc/rc.d/init.d/connectioncheck start &'); } ### ### Red device is ethernet ### - if ($netsettings{'CONFIG_TYPE'} =~ /^(2|3|6|7)$/) + if ($netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/) { if ($netsettings{'RED_DEV'} ne '') { @@ -255,7 +255,7 @@ elsif ($ARGV[0] eq 'stop') } # Bring down Ethernet interfaces & Kill DHCPC daemons - if (($netsettings{'CONFIG_TYPE'} =~ /^(2|3|6|7)$/) && ( $netsettings{'RED_TYPE'} eq 'PPPOE') && $iface ) { + if (($netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/) && ( $netsettings{'RED_TYPE'} eq 'PPPOE') && $iface ) { system ("/sbin/ifconfig", $iface, "down"); } if ($device) { @@ -283,8 +283,8 @@ elsif ($ARGV[0] eq 'stop') if ($pppsettings{'TYPE'} eq 'isdn') { system('/etc/rc.d/rc.isdn','stop'); } if ($pppsettings{'TYPE'} eq 'fritzdsl') { system ('/etc/rc.d/rc.fritzdsl','stop'); } - if ( ( $netsettings{'CONFIG_TYPE'} =~ /^(2|3|6|7)$/ && $netsettings{'RED_TYPE'} eq 'STATIC') || - ( $netsettings{'CONFIG_TYPE'} =~ /^(0|1|4|5)$/ && $pppsettings{'PROTOCOL'} eq 'RFC1483' && + if ( ( $netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/ && $netsettings{'RED_TYPE'} eq 'STATIC') || + ( $netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/ && $pppsettings{'PROTOCOL'} eq 'RFC1483' && $pppsettings{'METHOD'} eq 'STATIC' ) ) { system ("/etc/rc.d/init.d/network red update"); }