diff options
| author | Eugeni Dodonov <eugeni@mandriva.org> | 2009-03-18 21:15:34 +0000 |
|---|---|---|
| committer | Eugeni Dodonov <eugeni@mandriva.org> | 2009-03-18 21:15:34 +0000 |
| commit | addd108e464eb7b94f90c322b27043c9932c065e (patch) | |
| tree | 3fd765a8c2df7d088c78052fd1e565fbadccc88f | |
| parent | 7cc339f07aa6f46c84ab725965d723a3264554ca (diff) | |
| download | drakx-net-addd108e464eb7b94f90c322b27043c9932c065e.tar drakx-net-addd108e464eb7b94f90c322b27043c9932c065e.tar.gz drakx-net-addd108e464eb7b94f90c322b27043c9932c065e.tar.bz2 drakx-net-addd108e464eb7b94f90c322b27043c9932c065e.tar.xz drakx-net-addd108e464eb7b94f90c322b27043c9932c065e.zip | |
Preserving CRDA_DOMAIN value.
| -rw-r--r-- | lib/network/connection/wireless.pm | 2 | ||||
| -rw-r--r-- | lib/network/network.pm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/network/connection/wireless.pm b/lib/network/connection/wireless.pm index f877be4..9ea8199 100644 --- a/lib/network/connection/wireless.pm +++ b/lib/network/connection/wireless.pm @@ -667,7 +667,7 @@ set SSID=$self->{access}{network}{essid} set WPAPSK="$self->{access}{network}{key}" set TxRate=0)), (map { $_ => $self->{ifcfg}{$_} } - qw(WIRELESS_NWID WIRELESS_FREQ WIRELESS_SENS WIRELESS_RATE WIRELESS_RTS WIRELESS_FRAG WIRELESS_IWCONFIG WIRELESS_IWSPY), if_(!$self->need_rt2x00_iwpriv, 'WIRELESS_IWPRIV')), + qw(WIRELESS_NWID WIRELESS_FREQ WIRELESS_SENS WIRELESS_RATE WIRELESS_RTS WIRELESS_FRAG WIRELESS_IWCONFIG WIRELESS_IWSPY CRDA_DOMAIN), if_(!$self->need_rt2x00_iwpriv, 'WIRELESS_IWPRIV')), }; $self->SUPER::build_ifcfg_settings($settings); } diff --git a/lib/network/network.pm b/lib/network/network.pm index 876dfb6..63ab8bb 100644 --- a/lib/network/network.pm +++ b/lib/network/network.pm @@ -182,7 +182,7 @@ sub update_broadcast_and_network { sub write_interface_settings { my ($intf, $file) = @_; setVarsInSh($file, $intf, qw(DEVICE BOOTPROTO IPADDR NETMASK NETWORK BROADCAST GATEWAY ONBOOT HWADDR METRIC MII_NOT_SUPPORTED TYPE USERCTL ATM_ADDR ATM_DEVICE ETHTOOL_OPTS VLAN MTU DNS1 DNS2 DOMAIN RESOLV_MODS LINK_DETECTION_DELAY), - qw(WIRELESS_MODE WIRELESS_ESSID WIRELESS_NWID WIRELESS_FREQ WIRELESS_SENS WIRELESS_RATE WIRELESS_ENC_KEY WIRELESS_ENC_MODE WIRELESS_RTS WIRELESS_FRAG WIRELESS_IWCONFIG WIRELESS_IWSPY WIRELESS_IWPRIV WIRELESS_WPA_DRIVER WIRELESS_WPA_REASSOCIATE), + qw(WIRELESS_MODE WIRELESS_ESSID WIRELESS_NWID WIRELESS_FREQ WIRELESS_SENS WIRELESS_RATE WIRELESS_ENC_KEY WIRELESS_ENC_MODE WIRELESS_RTS WIRELESS_FRAG WIRELESS_IWCONFIG WIRELESS_IWSPY WIRELESS_IWPRIV WIRELESS_WPA_DRIVER WIRELESS_WPA_REASSOCIATE CRDA_DOMAIN), qw(DVB_ADAPTER_ID DVB_NETWORK_DEMUX DVB_NETWORK_PID), qw(IPV6INIT IPV6TO4INIT), qw(MRU REMIP PPPOPTIONS HARDFLOWCTL DEFABORT RETRYTIMEOUT PAPNAME LINESPEED MODEMPORT DEBUG ESCAPECHARS INITSTRING), |