summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <blino@mageia.org>2011-12-14 22:41:57 +0000
committerOlivier Blin <blino@mageia.org>2011-12-14 22:41:57 +0000
commit9824ed22fb9b428d5f7efc076eb526e0703a4d0e (patch)
tree612dbb09c96258d199033fd1f0cd8c107586c79f
parentc72985f51e4047998c6a9f75ac31abdb285a28d2 (diff)
downloaddrakx-net-9824ed22fb9b428d5f7efc076eb526e0703a4d0e.tar
drakx-net-9824ed22fb9b428d5f7efc076eb526e0703a4d0e.tar.gz
drakx-net-9824ed22fb9b428d5f7efc076eb526e0703a4d0e.tar.bz2
drakx-net-9824ed22fb9b428d5f7efc076eb526e0703a4d0e.tar.xz
drakx-net-9824ed22fb9b428d5f7efc076eb526e0703a4d0e.zip
wireless scan: use programs from prefix, not installer root (#1452)
-rw-r--r--NEWS2
-rw-r--r--lib/network/monitor.pm12
2 files changed, 8 insertions, 6 deletions
diff --git a/NEWS b/NEWS
index e03a135..6c8d5b2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- wireless scan: use programs from prefix, not installer root (#1452)
+
1.1:
- drakfirewall: use . instead of source in /etc/ifw/rules
- shorewall:
diff --git a/lib/network/monitor.pm b/lib/network/monitor.pm
index 1182de4..d8fb258 100644
--- a/lib/network/monitor.pm
+++ b/lib/network/monitor.pm
@@ -26,8 +26,8 @@ sub list_wireless {
} if $monitor;
#- try wpa_cli if we're root
if (!$has_roaming && !$>) {
- $results = `/usr/sbin/wpa_cli scan_results 2>/dev/null`;
- $list = `/usr/sbin/wpa_cli list_networks 2>/dev/null`;
+ $results = `$::prefix/usr/sbin/wpa_cli scan_results 2>/dev/null`;
+ $list = `$::prefix/usr/sbin/wpa_cli list_networks 2>/dev/null`;
$_ =~ s/^Selected interface (.*)\n//g foreach $results, $list;
}
if ($results && $list) {
@@ -63,10 +63,10 @@ sub list_wireless {
#- else use iwlist
require network::connection::wireless;
my ($current_essid, $current_ap) = network::connection::wireless::get_access_point($o_intf);
- if ($o_intf && !$> && !`/sbin/ip link show $o_intf up`) {
- system("/sbin/ip link set $o_intf up");
+ if ($o_intf && !$> && !`$::prefix/sbin/ip link show $o_intf up`) {
+ system("$::prefix/sbin/ip link set $o_intf up");
}
- my @list = `/sbin/iwlist $o_intf scanning 2>/dev/null`;
+ my @list = `$::prefix/sbin/iwlist $o_intf scanning 2>/dev/null`;
my $net = {};
my $quality_match = qr/Quality[:=](\S*)/;
my $eval_quality = sub {
@@ -103,7 +103,7 @@ sub list_wireless {
$_->{signal_strength} = $level if $incorrect_quality;
}
if ($current_ap && exists $networks{$current_ap}) {
- foreach (`/sbin/iwconfig $o_intf 2>/dev/null`) {
+ foreach (`$::prefix/sbin/iwconfig $o_intf 2>/dev/null`) {
my $quality = $_ =~ $quality_match && $eval_quality->($1);
$networks{$current_ap}{signal_strength} = $quality if $quality;
}