summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-10-06 13:33:47 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-10-06 13:33:47 +0000
commiteb5981fa86571102b046565de0a7691292c1dede (patch)
tree77a2a5709de2f32dfcf6d1cac09e25af7f672736
parent3fef4cbe0a0ffc1b125f35e40040b497325f6e4a (diff)
downloaddrakx-eb5981fa86571102b046565de0a7691292c1dede.tar
drakx-eb5981fa86571102b046565de0a7691292c1dede.tar.gz
drakx-eb5981fa86571102b046565de0a7691292c1dede.tar.bz2
drakx-eb5981fa86571102b046565de0a7691292c1dede.tar.xz
drakx-eb5981fa86571102b046565de0a7691292c1dede.zip
fix #3276: when steping back in drakconnect wizard, do not overwrite
first card parameters with last one's
-rw-r--r--perl-install/network/ethernet.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm
index 7eb54397e..ef44e7db9 100644
--- a/perl-install/network/ethernet.pm
+++ b/perl-install/network/ethernet.pm
@@ -159,13 +159,13 @@ sub configureNetwork {
configureNetwork_step_1:
$netc ||= {};
- my $last; foreach (@all_cards) {
+ my ($last, %last); foreach (@all_cards) {
my $intf2 = findIntf($intf ||= {}, $_->[0]);
- add2hash($intf2, $last);
+ add2hash($intf2, $last{$intf->{DEVICE}});
add2hash($intf2, { NETMASK => '255.255.255.0' });
configureNetworkIntf($netc, $in, $intf2, $netc->{NET_DEVICE}, 0, $_->[1]) or return;
- $last = $intf2;
+ $last = $last{$intf2->{DEVICE}} = $intf2;
}
$last or return;