summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-09-14 07:28:33 +0000
committerOlivier Blin <oblin@mandriva.org>2004-09-14 07:28:33 +0000
commit6977805cc1c1d2b700077b181faef72a12447fd4 (patch)
tree3f05528d84296b84accfe05c552aac5b42bfd92a
parent80eb9f2c654899c59b2a3aaa5ea2d16728d9c181 (diff)
downloaddrakx-6977805cc1c1d2b700077b181faef72a12447fd4.tar
drakx-6977805cc1c1d2b700077b181faef72a12447fd4.tar.gz
drakx-6977805cc1c1d2b700077b181faef72a12447fd4.tar.bz2
drakx-6977805cc1c1d2b700077b181faef72a12447fd4.tar.xz
drakx-6977805cc1c1d2b700077b181faef72a12447fd4.zip
do not configure eth aliases in various places, move aliases
configuration code from get_eth_cards_names to configure_eth_aliases
-rw-r--r--perl-install/network/ethernet.pm13
1 files changed, 3 insertions, 10 deletions
diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm
index 723daa196..0601c1c21 100644
--- a/perl-install/network/ethernet.pm
+++ b/perl-install/network/ethernet.pm
@@ -80,13 +80,6 @@ sub get_eth_cards {
sub get_eth_cards_names {
my ($modules_conf, @all_cards) = @_;
-
- foreach my $card (@all_cards) {
- #- fix modules aliases
- $modules_conf->remove_alias($card->[1]);
- $modules_conf->set_alias($card->[0], $card->[1]);
- }
-
{ map { $_->[0] => join(': ', $_->[0], $_->[2]) } @all_cards };
}
@@ -111,9 +104,9 @@ sub update_iftab() {
# automatic net aliases configuration
sub configure_eth_aliases {
my ($modules_conf) = @_;
- foreach (detect_devices::getNet()) {
- my $driver = c::getNetDriver($_) or next;
- $modules_conf->set_alias($_, $driver);
+ foreach my $card (get_eth_cards()) {
+ $modules_conf->remove_alias($card->[1]);
+ $modules_conf->set_alias($card->[0], $card->[1]);
}
}