summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-09-14 21:34:02 +0000
committerOlivier Blin <oblin@mandriva.org>2005-09-14 21:34:02 +0000
commit3af350fa3fbb89feece5f9d36554736b762c688b (patch)
tree0ddbef6a1b6547621d3a197d6898dd53ecc85997
parenta00eca21bb160bccd3c2230108683cedb114ae5e (diff)
downloaddrakx-3af350fa3fbb89feece5f9d36554736b762c688b.tar
drakx-3af350fa3fbb89feece5f9d36554736b762c688b.tar.gz
drakx-3af350fa3fbb89feece5f9d36554736b762c688b.tar.bz2
drakx-3af350fa3fbb89feece5f9d36554736b762c688b.tar.xz
drakx-3af350fa3fbb89feece5f9d36554736b762c688b.zip
call network::ethernet::update_iftab from network::ethernet::configure_eth_aliases
-rw-r--r--perl-install/network/ethernet.pm1
-rw-r--r--perl-install/network/network.pm1
-rwxr-xr-xperl-install/standalone/service_harddrake1
3 files changed, 1 insertions, 2 deletions
diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm
index 5583aa049..02fcba377 100644
--- a/perl-install/network/ethernet.pm
+++ b/perl-install/network/ethernet.pm
@@ -141,6 +141,7 @@ sub configure_eth_aliases {
}
}
$::isStandalone and $modules_conf->write;
+ update_iftab();
}
sub is_ifplugd_blacklisted {
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm
index 960599955..d47d5b309 100644
--- a/perl-install/network/network.pm
+++ b/perl-install/network/network.pm
@@ -578,7 +578,6 @@ sub configure_network {
my ($net, $in, $modules_conf) = @_;
if (!$::testing) {
require network::ethernet;
- network::ethernet::update_iftab();
network::ethernet::configure_eth_aliases($modules_conf);
write_network_conf($net);
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index e186b600e..4fcbb14a4 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -136,7 +136,6 @@ foreach my $hw_class (@harddrake::data::tree) {
$modules_conf->remove_alias_regexp('^(wlan|eth)[0-9]*$');
modules::load_category($modules_conf, 'network/main|gigabit|usb|wireless|firewire|pcmcia');
require network::ethernet;
- network::ethernet::update_iftab();
network::ethernet::configure_eth_aliases($modules_conf);
$modules_conf->write;
next;