webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-05-05 03:18:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

DHCPCD wurde nicht gekillt :(

Browse Source 
Connectionscript umgearbeitet.


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@386 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2007-01-08 15:02:21 +00:00
parent 6f00de0d6d
commit f2d9af8147
3 changed files with 129 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/initscripts/init.d/red
View File

@@ -101,7 +101,7 @@ if ($ARGV[0] eq 'start') {
if ( ( ( ($netsettings{'RED_TYPE'} =~ /^(PPPOE|PPTP)$/) && ($netsettings{'CONFIG_TYPE'} =~ /^(2|3|6|7)$/) ) ||
( ( ($pppsettings{'METHOD'} =~ /^(PPPOE|PPPOE_PLUGIN)$/) || ($pppsettings{'PROTOCOL'} eq 'RFC2364') ) &&
($netsettings{'CONFIG_TYPE'} =~ /^(0|1|4|5)$/) ) ) && ($pppsettings{'RECONNECTION'} ne 'manual') ) {
system ('/etc/rc.d/rc.connectioncheck start &');
system ('/etc/rc.d/init.d/connectioncheck start &');
}
###
@@ -240,7 +240,7 @@ elsif ($ARGV[0] eq 'stop')
unlink "${General::swroot}/red/resolv.conf";
unlink "${General::swroot}/red/device";
# stay with keepconnected during transitional rc.red stop ordered by rc.connectioncheck
# stay with keepconnected during transitional rc.red stop ordered by connectioncheck
if ( ! -e "${General::swroot}/red/redial") {
unlink "${General::swroot}/red/keepconnected";
}
@@ -264,7 +264,7 @@ elsif ($ARGV[0] eq 'stop')
}
my $file;
while (($file = glob("${General::swroot}/dhcpc/dhcpcd-*.pid") )) {
while (($file = glob("/var/run/dhcpcd-*.pid") )) {
if (open(FILE, $file)) {
my $pid = <FILE>;
close FILE;
@@ -281,8 +281,8 @@ elsif ($ARGV[0] eq 'stop')
system ('/sbin/ifconfig', 'atm0', 'down');
}
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 ($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' &&