Credits ueberarbeitet.

Menue Rewrite
Connectioncheck gefixt --> DSL/PPPoE works!


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@418 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2007-02-14 19:30:59 +00:00
parent 3a70a53840
commit 24249567ce
15 changed files with 354 additions and 355 deletions

View File

@@ -42,7 +42,7 @@ case "$1" in
/etc/rc.d/init.d/red start
exit
fi
# give 5 s more at pppd to be visible with ps ax after 'rc.red start' end
# give 5 s more at pppd to be visible with ps ax after 'red start' end
if [ "$RCREDSTART" = '' ]; then
TIMETOSTART=1
fi
@@ -83,7 +83,7 @@ case "$1" in
# this attempt to connect fail, so retry
#Don't erase keepconnected because it is used to watch user actions
/bin/touch /var/ipfire/red/redial
/usr/bin/touch /var/ipfire/red/redial
/etc/rc.d/init.d/red stop
while ( /bin/ps ax | /bin/grep -q [p]ppd ); do
msg "waiting pppd exit"

View File

@@ -515,6 +515,7 @@ sub doisdndial
sub dopppoedial
{
system("mknod /dev/ppp c 108 0 2>/dev/null");
if ($pppsettings{'METHOD'} ne 'PPPOE_PLUGIN') {
my @pppcommand = ('/usr/sbin/pppd', 'pty');
my @pppoecommand = ('/usr/sbin/pppoe', '-p','/var/run/pppoe.pid','-I',
@@ -604,6 +605,7 @@ sub dopptpdial
{
my %pptpdhcpc;
my $routerip = $pppsettings{'ROUTERIP'} ? $pppsettings{'ROUTERIP'} : "10.0.0.138";
system("mknod /dev/ppp c 108 0 2>/dev/null");
if ( $pppsettings{'METHOD'} eq 'DHCP' && open(FILE, "${General::swroot}/red/device")) {
my $device = <FILE>;
close FILE;
@@ -682,6 +684,7 @@ sub dofritzdsldial
$controller=1; # fcdslslusb
}
}
system("mknod /dev/ppp c 108 0 2>/dev/null");
my @pppcommand = ('/usr/sbin/pppd');
my @capiplugin;
@@ -733,6 +736,7 @@ sub dofritzdsldial
sub doatmdial
{
my $ENCAP;
system("mknod /dev/ppp c 108 0 2>/dev/null");
if ($pppsettings {'PROTOCOL'} eq 'RFC2364') {
system ('/sbin/modprobe pppoatm');
my @pppcommand = ('/usr/sbin/pppd');