summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-05-28 20:48:18 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-05-28 20:48:18 +0000
commitedda1920119dd43d04d3ca38d296993f352f2e95 (patch)
tree356278c835a93f31386753ea5ffd5e4c1a1f062b
parent8050ab95917f595fc59315c80c0b377389917a81 (diff)
downloaddrakx-edda1920119dd43d04d3ca38d296993f352f2e95.tar
drakx-edda1920119dd43d04d3ca38d296993f352f2e95.tar.gz
drakx-edda1920119dd43d04d3ca38d296993f352f2e95.tar.bz2
drakx-edda1920119dd43d04d3ca38d296993f352f2e95.tar.xz
drakx-edda1920119dd43d04d3ca38d296993f352f2e95.zip
(real_main) fix protocol switching from manual to auto when stepping back
-rw-r--r--perl-install/network/netconnect.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index d61673cf3..54ef823f4 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -86,7 +86,7 @@ sub real_main {
my ($ntf_name, $ipadr, $netadr, $gateway_ex, $up, $need_restart_network);
my ($isdn, $isdn_name, $isdn_type, %isdn_cards);
my $my_isdn = join('', N("Manual choice"), " (", N("Internal ISDN card"), ")");
- my ($module, $auto_ip, $onboot, $needhostname, $hotplug, $track_network_id, @fields); # lan config
+ my ($module, $auto_ip, $protocol, $onboot, $needhostname, $hotplug, $track_network_id, @fields); # lan config
my $success = 1;
my $ethntf = {};
my $db_path = "$::prefix/usr/share/apps/kppp/Provider";
@@ -865,7 +865,7 @@ Modifying the fields below will override this configuration."),
{
pre => sub {
$find_lan_module->();
- $auto_ip = $l10n_lan_protocols{defined $auto_ip ? ($auto_ip ? 'dhcp' : 'static') : $ethntf->{BOOTPROTO}} || 0;
+ $protocol = $l10n_lan_protocols{defined $auto_ip ? ($auto_ip ? 'dhcp' : 'static') : $ethntf->{BOOTPROTO}} || 0;
},
name => sub {
my $_msg = N("Zeroconf hostname resolution");
@@ -873,10 +873,10 @@ Modifying the fields below will override this configuration."),
N("The following protocols can be used to configure an ethernet connection. Please choose the one you want to use")
},
data => sub {
- [ { val => \$auto_ip, type => "list", list => [ sort values %l10n_lan_protocols ] } ];
+ [ { val => \$protocol, type => "list", list => [ sort values %l10n_lan_protocols ] } ];
},
post => sub {
- $auto_ip = $auto_ip ne $l10n_lan_protocols{static} || 0;
+ $auto_ip = $protocol ne $l10n_lan_protocols{static} || 0;
return 'lan_intf';
},
},