diff options
| author | Olivier Blin <oblin@mandriva.org> | 2005-11-05 14:55:54 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2005-11-05 14:55:54 +0000 |
| commit | fc383ba96483a0883e9dee68b24fcaeb1fa28c73 (patch) | |
| tree | 32a6faa5fe675c368c35393cd13c3456e639eb63 | |
| parent | dfd109a00835f14ded71aaa3eccee52f012e20aa (diff) | |
| download | drakx-fc383ba96483a0883e9dee68b24fcaeb1fa28c73.tar drakx-fc383ba96483a0883e9dee68b24fcaeb1fa28c73.tar.gz drakx-fc383ba96483a0883e9dee68b24fcaeb1fa28c73.tar.bz2 drakx-fc383ba96483a0883e9dee68b24fcaeb1fa28c73.tar.xz drakx-fc383ba96483a0883e9dee68b24fcaeb1fa28c73.zip | |
don't log wpa_cli/iwgetid/iwlist commands
| -rw-r--r-- | perl-install/network/monitor.pm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/network/monitor.pm b/perl-install/network/monitor.pm index 6376b3d92..e785ce469 100644 --- a/perl-install/network/monitor.pm +++ b/perl-install/network/monitor.pm @@ -25,8 +25,8 @@ sub list_wireless { my $has_roaming = defined $results && defined $list; #- try wpa_cli if we're root if ($@ && !$>) { - $results = run_program::get_stdout('/usr/sbin/wpa_cli', '2>', '/dev/null', 'scan_results'); - $list = run_program::get_stdout('/usr/sbin/wpa_cli', '2>', '/dev/null', 'list_networks'); + $results = `/usr/sbin/wpa_cli scan_results 2>/dev/null`; + $list = `/usr/sbin/wpa_cli list_networks 2>/dev/null`; } if (defined $results && defined $list) { #- bssid / frequency / signal level / flags / ssid @@ -49,9 +49,9 @@ sub list_wireless { } } elsif ($o_intf) { #- else use iwlist - my $current_essid = chomp_(run_program::get_stdout('/sbin/iwgetid', '-r', $o_intf)); - my $current_ap = lc(chomp_(run_program::get_stdout('/sbin/iwgetid', '-r', '-a', $o_intf))); - my @list = run_program::get_stdout('/sbin/iwlist', $o_intf, 'scanning'); + my $current_essid = chomp_(`/sbin/iwgetid -r $o_intf`); + my $current_ap = lc(chomp_(`/sbin/iwgetid -r -a $o_intf`)); + my @list = `/sbin/iwlist $o_intf scanning`; my $net = {}; foreach (@list) { if ((/^\s*$/ || /Cell/) && exists $net->{ap}) { |