diff options
| author | damien <damien@mandriva.com> | 2001-07-30 23:30:37 +0000 |
|---|---|---|
| committer | damien <damien@mandriva.com> | 2001-07-30 23:30:37 +0000 |
| commit | 84a49da0acdb4e741c09bae2de7e04fcea949869 (patch) | |
| tree | 0ca7ba6f634e42299840fb489dade2a293d798e9 | |
| parent | 8b288e6df423282c3a51f6775d5feadf12b796be (diff) | |
| download | drakx-backup-do-not-use-84a49da0acdb4e741c09bae2de7e04fcea949869.tar drakx-backup-do-not-use-84a49da0acdb4e741c09bae2de7e04fcea949869.tar.gz drakx-backup-do-not-use-84a49da0acdb4e741c09bae2de7e04fcea949869.tar.bz2 drakx-backup-do-not-use-84a49da0acdb4e741c09bae2de7e04fcea949869.tar.xz drakx-backup-do-not-use-84a49da0acdb4e741c09bae2de7e04fcea949869.zip | |
corrected ask_connect_now behaviour
| -rw-r--r-- | perl-install/network/netconnect.pm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index b1c74ed2f..bb136e64b 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -176,15 +176,17 @@ ifdown eth0 $conf{lan} and do { require network::ethernet; network::ethernet::configure_lan($netcnx, $netc, $intf, $first_time) or goto step_2 }; step_2_1: - if (keys %{$netc->{internet_cnx}} > 1) { + my $nb = keys %{$netc->{internet_cnx}}; + if ($nb < 1) { + } elsif ($nb > 1) { $in->ask_from_entries_refH(_("Network Configuration Wizard"), _("You have configured multiple ways to connect to the Internet.\nChoose the one you want to use.\n\n" . if_(!$::isStandalone, "You may want to configure some profiles after the installation, in the Mandrake Control Center")), [ { label => _("Internet connection"), val => \$netc->{internet_cnx_choice}, list => [ keys %{$netc->{internet_cnx}} ]} ] ) or goto step_2; - } elsif (keys %{$netc->{internet_cnx}} == 1) { - $netc->{internet_cnx_choice} = $netc->{internet_cnx}[1]; + } elsif ($nb == 1) { + $netc->{internet_cnx_choice} = (keys %{$netc->{internet_cnx}})[0]; } $netc->{internet_cnx_choice} and write_cnx_script($netc); |