diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2003-11-07 19:29:45 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2003-11-07 19:29:45 +0000 |
| commit | a14362c9c16372cac4358d1f587757edb2aa8b82 (patch) | |
| tree | 823b024174e14e5c41c674c26ed1785a83b5e856 | |
| parent | 0f6426ea21fc3d00b7002e706feb1690fc1c67a8 (diff) | |
| download | drakx-a14362c9c16372cac4358d1f587757edb2aa8b82.tar drakx-a14362c9c16372cac4358d1f587757edb2aa8b82.tar.gz drakx-a14362c9c16372cac4358d1f587757edb2aa8b82.tar.bz2 drakx-a14362c9c16372cac4358d1f587757edb2aa8b82.tar.xz drakx-a14362c9c16372cac4358d1f587757edb2aa8b82.zip | |
(write_interface_conf) 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 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm index c19c502f2..9f0657073 100644 --- a/perl-install/network/network.pm +++ b/perl-install/network/network.pm @@ -10,7 +10,6 @@ use Socket; use common; use detect_devices; use run_program; -use network::tools; use any; use vars qw(@ISA @EXPORT); use log; @@ -177,7 +176,7 @@ sub write_interface_conf { 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"); |