From 1e5733a673d74eed07e3c5afceec3c879443b9fb Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 12 Nov 2003 17:30:39 +0000 Subject: (write_interface_conf) forward fix: setVarsInSh() already take care of not writing undefined parameters, so it's safer to always write wireless parameters if set else we drop user set wireless parameters when our wireless modules list is not uptodate --- perl-install/network/network.pm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm index 8b14a2fae..ec454bd0b 100644 --- a/perl-install/network/network.pm +++ b/perl-install/network/network.pm @@ -174,10 +174,8 @@ sub write_interface_conf { $intf->{BOOTPROTO} =~ s/dhcp.*/dhcp/; - require network::ethernet; - my %cards = map { $_->[0] => $_->[1] } network::ethernet::conf_network_card_backend($netc, $intf); setVarsInSh($file, $intf, qw(DEVICE BOOTPROTO IPADDR NETMASK NETWORK BROADCAST ONBOOT HWADDR MII_NOT_SUPPORTED), - if_(is_wireless_intf($cards{$intf->{DEVICE}}), qw(WIRELESS_MODE WIRELESS_ESSID WIRELESS_NWID WIRELESS_FREQ WIRELESS_SENS WIRELESS_RATE WIRELESS_ENC_KEY WIRELESS_RTS WIRELESS_FRAG WIRELESS_IWCONFIG WIRELESS_IWSPY WIRELESS_IWPRIV)), + qw(WIRELESS_MODE WIRELESS_ESSID WIRELESS_NWID WIRELESS_FREQ WIRELESS_SENS WIRELESS_RATE WIRELESS_ENC_KEY WIRELESS_RTS WIRELESS_FRAG WIRELESS_IWCONFIG WIRELESS_IWSPY WIRELESS_IWPRIV), if_($intf->{BOOTPROTO} eq "dhcp", qw(DHCP_HOSTNAME NEEDHOSTNAME)) ); log::explanations("written $intf->{DEVICE} interface configuration in $file"); -- cgit v1.2.1