summaryrefslogtreecommitdiffstats
path: root/lib/network/connection
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-05-12 11:50:11 +0000
committerOlivier Blin <oblin@mandriva.com>2008-05-12 11:50:11 +0000
commit50a03e4f30160176c32840840082cd8e8db94a70 (patch)
tree70a27c54990ad1bc84b7d03c68084fda96b2a0a1 /lib/network/connection
parentdde7379145737062ece168593b07f11a78cb535b (diff)
downloaddrakx-net-50a03e4f30160176c32840840082cd8e8db94a70.tar
drakx-net-50a03e4f30160176c32840840082cd8e8db94a70.tar.gz
drakx-net-50a03e4f30160176c32840840082cd8e8db94a70.tar.bz2
drakx-net-50a03e4f30160176c32840840082cd8e8db94a70.tar.xz
drakx-net-50a03e4f30160176c32840840082cd8e8db94a70.zip
default to roaming for all encryption types if ROAMING is true in /etc/sysconfig/drakx-net
Diffstat (limited to 'lib/network/connection')
-rw-r--r--lib/network/connection/wireless.pm6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/network/connection/wireless.pm b/lib/network/connection/wireless.pm
index 3e72f80..9bca85a 100644
--- a/lib/network/connection/wireless.pm
+++ b/lib/network/connection/wireless.pm
@@ -363,7 +363,11 @@ sub guess_network_access_settings {
undef $self->{ifcfg}{WIRELESS_IWPRIV} if is_old_rt2x00($self->get_driver) && $self->{ifcfg}{WIRELESS_IWPRIV} =~ /WPAPSK/;
- $self->{control}{roaming} = exists $self->{ifcfg}{WIRELESS_WPA_DRIVER} && !is_old_rt2x00($self->get_driver);
+ my $system_file = '/etc/sysconfig/drakx-net';
+ my %global_settings = getVarsFromSh($system_file);
+ $self->{control}{roaming} =
+ (exists $self->{ifcfg}{WIRELESS_WPA_DRIVER} || text2bool($global_settings{ROAMING}))
+ && !is_old_rt2x00($self->get_driver);
$self->{access}{network}{mode} =
$network && $network->{mode} ||