[Debian-eeepc-commits] [SCM] Maintenance of eeepc-acpi-scripts debian package branch, master, updated. 166b17992144cd0b3b9c96afe2d35dbdb80f46b4

[Damyan Ivanov]

The following commit has been merged in the master branch:
commit 166b17992144cd0b3b9c96afe2d35dbdb80f46b4
Author: Damyan Ivanov <dmn at debian.org>
Date:   Mon Feb 2 22:01:22 2009 +0200

    fix wirelss logic for 2.6.26
    
    Thing is, $RFKILL ends up empty, and a following [ -e '' ] wrongly
    succeeds, causing stdin to be read later instead of the wireless
    control node
    
    This patch adds a check if $wlan_control variable is  set before checking
    for existence

diff --git a/etc/acpi/actions/wireless.sh b/etc/acpi/actions/wireless.sh
index 1467e4f..3d4798d 100755
--- a/etc/acpi/actions/wireless.sh
+++ b/etc/acpi/actions/wireless.sh
@@ -4,7 +4,9 @@
 
 detect_rfkill eeepc-wlan
 wlan_control="$RFKILL"
-[ -e $wlan_control ] || wlan_control=/sys/devices/platform/eeepc/wlan # pre-2.6.28
+
+[ -n "$wlan_control" -a -e $wlan_control ] \
+    || wlan_control=/sys/devices/platform/eeepc/wlan # pre-2.6.28
 [ -e $wlan_control ] || wlan_control=/proc/acpi/asus/wlan # pre-2.6.26
 
 cmd="$1"

-- 
Maintenance of eeepc-acpi-scripts debian package