summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-07-30 12:44:43 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-07-30 12:44:43 +0000
commita39497eea7ae558239d2abbc3008521fcb8d0afc (patch)
tree5f0fc513cc8221086fafcf722854d0a80c564607
parent9ba45465ec57f6a03417e810c3defec080579355 (diff)
downloaddrakx-a39497eea7ae558239d2abbc3008521fcb8d0afc.tar
drakx-a39497eea7ae558239d2abbc3008521fcb8d0afc.tar.gz
drakx-a39497eea7ae558239d2abbc3008521fcb8d0afc.tar.bz2
drakx-a39497eea7ae558239d2abbc3008521fcb8d0afc.tar.xz
drakx-a39497eea7ae558239d2abbc3008521fcb8d0afc.zip
revert to 1.129:
it's no good removing " (using module ...)" from {DEVICE} field, it's much better not having it in the first place. See network/ethernet.pm v1.81 for the real fix
-rw-r--r--perl-install/network/network.pm5
1 files changed, 1 insertions, 4 deletions
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm
index c50c58c5f..2b1f5c944 100644
--- a/perl-install/network/network.pm
+++ b/perl-install/network/network.pm
@@ -552,10 +552,7 @@ 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};
- # 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;
+ write_interface_conf("$etc/sysconfig/network-scripts/ifcfg-$_->{DEVICE}", $_, $netc, $prefix) foreach grep { $_->{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");