summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-05-12 12:33:59 +0000
committerOlivier Blin <oblin@mandriva.com>2008-05-12 12:33:59 +0000
commitafa9c4395c7aff570b871ae1a360e299a6e05d59 (patch)
treebf2165025783c4609b44eaa9d7394d09e2606870
parent41d76cf7af90d67fe01b1095b70abe7ba2b7ee30 (diff)
downloaddrakx-net-afa9c4395c7aff570b871ae1a360e299a6e05d59.tar
drakx-net-afa9c4395c7aff570b871ae1a360e299a6e05d59.tar.gz
drakx-net-afa9c4395c7aff570b871ae1a360e299a6e05d59.tar.bz2
drakx-net-afa9c4395c7aff570b871ae1a360e299a6e05d59.tar.xz
drakx-net-afa9c4395c7aff570b871ae1a360e299a6e05d59.zip
default to roaming for all encryption types if ROAMING is true in /etc/sysconfig/drakx-net
-rw-r--r--lib/network/connection/wireless.pm5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/network/connection/wireless.pm b/lib/network/connection/wireless.pm
index bdac4af..6cb43da 100644
--- a/lib/network/connection/wireless.pm
+++ b/lib/network/connection/wireless.pm
@@ -318,7 +318,10 @@ 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} ||