summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-10-08 21:53:01 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-10-08 21:53:01 +0000
commit24708d0c7d5fb675708e333d638202cffca251bb (patch)
treeff76a99d7528bd8e55df1f54a15c42751bd3f3d4
parent1f0f9b2752ce3950249eeb3119056c1425b00e2f (diff)
downloaddrakx-backup-do-not-use-24708d0c7d5fb675708e333d638202cffca251bb.tar
drakx-backup-do-not-use-24708d0c7d5fb675708e333d638202cffca251bb.tar.gz
drakx-backup-do-not-use-24708d0c7d5fb675708e333d638202cffca251bb.tar.bz2
drakx-backup-do-not-use-24708d0c7d5fb675708e333d638202cffca251bb.tar.xz
drakx-backup-do-not-use-24708d0c7d5fb675708e333d638202cffca251bb.zip
forward #3276 fix: 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;