diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2003-11-12 17:30:39 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2003-11-12 17:30:39 +0000 |
| commit | 1e5733a673d74eed07e3c5afceec3c879443b9fb (patch) | |
| tree | 3c068bcaf60d890a2b1d0380298cdffd647caa07 | |
| parent | 3aab08fdf38f1f1e5a457e3da35e4588e7d75115 (diff) | |
| download | drakx-backup-do-not-use-1e5733a673d74eed07e3c5afceec3c879443b9fb.tar drakx-backup-do-not-use-1e5733a673d74eed07e3c5afceec3c879443b9fb.tar.gz drakx-backup-do-not-use-1e5733a673d74eed07e3c5afceec3c879443b9fb.tar.bz2 drakx-backup-do-not-use-1e5733a673d74eed07e3c5afceec3c879443b9fb.tar.xz drakx-backup-do-not-use-1e5733a673d74eed07e3c5afceec3c879443b9fb.zip | |
(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
| -rw-r--r-- | perl-install/network/network.pm | 4 |
1 files changed, 1 insertions, 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"); |