From f64a2f25d435edd3507e477a25cb4c4e15297794 Mon Sep 17 00:00:00 2001
From: Ivan Shapovalov <intelfx100@gmail.com>
Date: Tue, 25 Feb 2014 15:26:17 +0100
Subject: wifi-menu: handle interface's rfkill switch

Temporarily enable the interface's rfkill (if specified) before issuing a scan
and restore its state afterwards.
---
 src/wifi-menu | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/wifi-menu b/src/wifi-menu
index 80eadd4..9efa2c0 100755
--- a/src/wifi-menu
+++ b/src/wifi-menu
@@ -2,6 +2,7 @@
 
 . /usr/lib/network/globals
 . "$SUBR_DIR/wpa"
+. "$SUBR_DIR/rfkill"
 
 
 usage()
@@ -236,16 +237,31 @@ if [[ -z "$INTERFACE" ]]; then
     INTERFACE=${INTERFACE:15:-10}
     report_debug "Using interface '$INTERFACE'"
 fi
+if [[ -x "$PROFILE_DIR/interfaces/$INTERFACE" ]]; then
+    source "$PROFILE_DIR/interfaces/$INTERFACE"
+fi
 
 cd /  # We do not want to spawn anything that can block unmounting
 if [[ ! -d "/sys/class/net/$INTERFACE" ]]; then
     exit_error "No such interface: $INTERFACE"
 fi
+if [[ "$RFKill" && "$(rf_status "$INTERFACE" "$RFKill")" ]]; then
+    if ! rf_enable "$INTERFACE" "$RFKill"; then
+        exit_error "Could not unblock transmission on interface '$INTERFACE'"
+    fi
+    RF_UNBLOCKED=1
+fi
 
 echo -n "Scanning for networks... "
 CONNECTION=$(wpa_call "$INTERFACE" status 2> /dev/null | sed -n "s/^ssid=//p")
 NETWORKS=$(wpa_supplicant_scan "$INTERFACE" 3,4,5)
-if [[ $? -eq 0 ]]; then
+RETURN=$?
+
+if (( RF_UNBLOCKED )); then
+    rf_disable "$INTERFACE" "$RFKill"
+fi
+
+if (( RETURN == 0 )); then
     trap 'rm -f "$NETWORKS"' EXIT
     echo "done"
     init_profiles "$INTERFACE"
-- 
cgit v1.2.3-24-g4f1b