From bc15a83cabafb782b145216b92db1c260dcf182d Mon Sep 17 00:00:00 2001 From: damien Date: Mon, 13 Aug 2001 15:11:18 +0000 Subject: adsl autodetection activated (planq the children) --- perl-install/network/adsl.pm | 1 - perl-install/network/netconnect.pm | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm index a922585cc..61a0d8f87 100644 --- a/perl-install/network/adsl.pm +++ b/perl-install/network/adsl.pm @@ -58,7 +58,6 @@ sub adsl_ask_info { #- output: #- true/false : success|failed sub adsl_detect { - return; my ($interface) = @_; run_program::rooted($prefix, "ifconfig $interface 10.0.0.10 netmask 255.255.255.0"); my $ret=run_program::rooted($prefix, "/bin/ping -c 1 10.0.0.138 2> /dev/null"); diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index a1fbee552..43737064e 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -73,7 +73,7 @@ sub detect { require network::adsl; network::adsl->import; map { - ( !$net_install and adsl_detect("", $_->[0]) ) ? $auto_detect->{adsl}=$_->[0] : $auto_detect->{lan}{$_->[0]}=$_->[1]; } @all_cards; + ( !$net_install and adsl_detect($_->[0]) ) ? $auto_detect->{adsl}=$_->[0] : $auto_detect->{lan}{$_->[0]}=$_->[1]; } @all_cards; my $modem={}; require network::modem; network::modem->import; -- cgit v1.2.1