diff options
author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-03-18 11:15:41 +0000 |
---|---|---|
committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-03-18 11:15:41 +0000 |
commit | 8dbfd1bae53c9e1efbc63861368cc75948766f29 (patch) | |
tree | 2dd6fb9aa0fb252b0e38949fab87db23e98e1c70 | |
parent | 9d52a8fe9edbb5440aa29963f2357f59ca895a3a (diff) | |
download | drakx-8dbfd1bae53c9e1efbc63861368cc75948766f29.tar drakx-8dbfd1bae53c9e1efbc63861368cc75948766f29.tar.gz drakx-8dbfd1bae53c9e1efbc63861368cc75948766f29.tar.bz2 drakx-8dbfd1bae53c9e1efbc63861368cc75948766f29.tar.xz drakx-8dbfd1bae53c9e1efbc63861368cc75948766f29.zip |
always offer to restart adsl connections
-rw-r--r-- | perl-install/network/netconnect.pm | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index dd4889c75..40f9cfeb1 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -200,7 +200,7 @@ sub real_main { }; my $handle_multiple_cnx = sub { - $need_restart_network = 1 if $netcnx->{type} =~ /lan|cable/; + $need_restart_network = 1 if $netcnx->{type} =~ /adsl|cable|lan/; my $nb = keys %{$netc->{internet_cnx}}; if (1 < $nb) { return "multiple_internet_cnx"; @@ -648,7 +648,6 @@ killall pppd 'speedtouch' => [ 'speedtouch', '/usr/share/speedtouch/speedtouch.sh' ], ); return 'adsl_unsupported_eci' if $ntf_name eq 'eci'; - $need_restart_network = member($ntf_name, qw(speedtouch eci)); $in->do_pkgs->install($packages{$ntf_name}->[0]) if $packages{$ntf_name} && !-e $packages{$ntf_name}->[1]; if ($ntf_name eq 'speedtouch') { $in->do_pkgs->ensure_is_installed_if_available('speedtouch_mgmt', "$::prefix/usr/share/speedtouch/mgmt.o"); |