summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-07-22 17:47:46 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-07-22 17:47:46 +0000
commit0012406e404bb707b77e9d27013dbf58d568f1c7 (patch)
treee83228555a920dda078d272e9918e08d7779dda2 /perl-install
parente3dd506a4412cabc6ae8dde095f82609fb0d45f6 (diff)
downloaddrakx-0012406e404bb707b77e9d27013dbf58d568f1c7.tar
drakx-0012406e404bb707b77e9d27013dbf58d568f1c7.tar.gz
drakx-0012406e404bb707b77e9d27013dbf58d568f1c7.tar.bz2
drakx-0012406e404bb707b77e9d27013dbf58d568f1c7.tar.xz
drakx-0012406e404bb707b77e9d27013dbf58d568f1c7.zip
fix fpons sucks (as usuall as he neither tests nor care about bug
reports)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/network/network.pm5
1 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm
index 2b1f5c944..c50c58c5f 100644
--- a/perl-install/network/network.pm
+++ b/perl-install/network/network.pm
@@ -552,7 +552,10 @@ sub configureNetwork2 {
$netc->{wireless_eth} and $in->do_pkgs->install(qw(wireless-tools));
write_conf("$etc/sysconfig/network", $netc);
write_resolv_conf("$etc/resolv.conf", $netc) if ! $netc->{DHCP};
- write_interface_conf("$etc/sysconfig/network-scripts/ifcfg-$_->{DEVICE}", $_, $netc, $prefix) foreach grep { $_->{DEVICE} } values %$intf;
+ # network::ethernet->conf_network_card_backend() may pass "ethX (using module XYZ)" to conf_network_card_backend() that set DEVICE
+ my $raw_device = $_->{DEVICE};
+ $raw_device =~ s/\s\(using module.*\)//;
+ write_interface_conf("$etc/sysconfig/network-scripts/ifcfg-$raw_device", $_, $netc, $prefix) foreach grep { $raw_device } values %$intf;
add2hosts("$etc/hosts", $netc->{HOSTNAME}, map { $_->{IPADDR} } values %$intf) if $netc->{HOSTNAME} && !$netc->{DHCP};
add2hosts("$etc/hosts", "localhost", "127.0.0.1");