summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-10-08 21:58:57 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-10-08 21:58:57 +0000
commit3a2fdb93c9cc558cc882983206efe146cf427201 (patch)
tree85b60c4dd8f90992e36fe7682fe3961485b91d53
parent23919e56b6fd937cf4c507726f92db315cd034cd (diff)
downloaddrakx-3a2fdb93c9cc558cc882983206efe146cf427201.tar
drakx-3a2fdb93c9cc558cc882983206efe146cf427201.tar.gz
drakx-3a2fdb93c9cc558cc882983206efe146cf427201.tar.bz2
drakx-3a2fdb93c9cc558cc882983206efe146cf427201.tar.xz
drakx-3a2fdb93c9cc558cc882983206efe146cf427201.zip
network interface configuration step: using network interface from
interface/driver list is more robust that relying on possibly empty int variable (better #3276 fix)
-rw-r--r--perl-install/network/ethernet.pm7
1 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm
index ef44e7db9..8c3bb5b56 100644
--- a/perl-install/network/ethernet.pm
+++ b/perl-install/network/ethernet.pm
@@ -159,13 +159,14 @@ sub configureNetwork {
configureNetwork_step_1:
$netc ||= {};
- my ($last, %last); foreach (@all_cards) {
+ my ($last, %last);
+ foreach (@all_cards) {
my $intf2 = findIntf($intf ||= {}, $_->[0]);
- add2hash($intf2, $last{$intf->{DEVICE}});
+ add2hash($intf2, $last{$_->[0]});
add2hash($intf2, { NETMASK => '255.255.255.0' });
configureNetworkIntf($netc, $in, $intf2, $netc->{NET_DEVICE}, 0, $_->[1]) or return;
- $last = $last{$intf2->{DEVICE}} = $intf2;
+ $last = $last{$_->[0]} = $intf2;
}
$last or return;