diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-01-20 11:08:07 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-01-20 11:08:07 +0000 |
| commit | 876c38be06d20bf35c0945c2e7458d1c7bdbec7c (patch) | |
| tree | bc7dd883b52efeb014e2e59d260f0109f741e47e | |
| parent | c556e6471601c7db821416568c495c6ff199f7d9 (diff) | |
| download | drakx-876c38be06d20bf35c0945c2e7458d1c7bdbec7c.tar drakx-876c38be06d20bf35c0945c2e7458d1c7bdbec7c.tar.gz drakx-876c38be06d20bf35c0945c2e7458d1c7bdbec7c.tar.bz2 drakx-876c38be06d20bf35c0945c2e7458d1c7bdbec7c.tar.xz drakx-876c38be06d20bf35c0945c2e7458d1c7bdbec7c.zip | |
do not mix modem choice and modem configuration, so that we keep
entered data when stepping back and forward
| -rw-r--r-- | perl-install/network/netconnect.pm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index 8bf5c4b8e..348bf1229 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -77,7 +77,8 @@ sub detect_timezone() { my $first_time = $o_first_time || 0; my ($network_configured, $direct_net_install, $cnx_type, $type, $interface, @cards, @all_cards, @devices); my (%connections, %rconnections, @connection_list); - my ($modem, $ntf_name, $ipadr, $netadr, $gateway_ex, $up, $modem, $isdn, $isdn_type, $adsl_type, $need_restart_network); + my ($modem, $modem_name); + my ($ntf_name, $ipadr, $netadr, $gateway_ex, $up, $isdn, $isdn_type, $adsl_type, $need_restart_network); my ($module, $text, $auto_ip, $net_device, $onboot, $needhostname, $hotplug, $track_network_id, @fields); # lan config my $success = 1; my $ethntf = {}; @@ -372,10 +373,10 @@ Take a look at http://www.linmodems.org"), }, name => N("Select the modem to configure:"), data => sub { - [ { label => N("Modem"), type => "list", val => \$modem, list => [ keys %{$netc->{autodetect}{modem}} ], allow_empty_list => 1 } ], + [ { label => N("Modem"), type => "list", val => \$modem_name, list => [ keys %{$netc->{autodetect}{modem}} ], allow_empty_list => 1 } ], }, post => sub { - $ntf_name = $netc->{autodetect}{modem}{$modem}{device} || $netc->{autodetect}{modem}{$modem}{description}; + $ntf_name = $netc->{autodetect}{modem}{$modem_name}{device} || $netc->{autodetect}{modem}{$modem_name}{description}; print "Interface is $ntf_name\n"; return "ppp_choose" if $ntf_name =~ m!^/dev/!; |