summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-09-06 14:03:52 +0000
committerOlivier Blin <oblin@mandriva.org>2004-09-06 14:03:52 +0000
commitf16478059a58518313a8d0571e927cdcb2fa7e12 (patch)
tree4e4ddedeb6cf66f0c5508da4f105a8ceb2099a78
parenteffc6e1a5a87d43a504bab6dddd0933edf678e55 (diff)
downloaddrakx-f16478059a58518313a8d0571e927cdcb2fa7e12.tar
drakx-f16478059a58518313a8d0571e927cdcb2fa7e12.tar.gz
drakx-f16478059a58518313a8d0571e927cdcb2fa7e12.tar.bz2
drakx-f16478059a58518313a8d0571e927cdcb2fa7e12.tar.xz
drakx-f16478059a58518313a8d0571e927cdcb2fa7e12.zip
adjust tests, dhcp/static adsl connections can now use non-ethernet devices
-rw-r--r--perl-install/network/netconnect.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 4512d0cf6..32302d8a6 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -181,7 +181,7 @@ sub real_main {
);
my $offer_to_connect = sub {
- return "ask_connect_now" if $netc->{internet_cnx_choice} eq 'adsl' && $adsl_devices{$ntf_name};
+ return "ask_connect_now" if $netc->{internet_cnx_choice} eq 'adsl' && !member($adsl_type, qw(manual dhcp));
return "ask_connect_now" if member($netc->{internet_cnx_choice}, qw(modem isdn));
return "end";
};
@@ -213,7 +213,7 @@ sub real_main {
};
my $handle_multiple_cnx = sub {
- $need_restart_network = member($netcnx->{type}, qw(cable lan)) || $netcnx->{type} eq 'adsl' && !$adsl_devices{$ntf_name};
+ $need_restart_network = member($netcnx->{type}, qw(cable lan)) || $netcnx->{type} eq 'adsl' && member($adsl_type, qw(manual dhcp));
my $nb = keys %{$netc->{internet_cnx}};
if (1 < $nb) {
return "multiple_internet_cnx";