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

[Darren Salt]

The following commit has been merged in the master branch:
commit 667c9a3079d93d25746680a9baf14c7baa9a7d71
Author: Darren Salt <linux at youmustbejoking.demon.co.uk>
Date:   Sat Mar 28 18:13:38 2009 +0000

    Don't do wireless rfkill toggling ourselves if it's handled by the kernel.

diff --git a/etc/acpi/actions/hotkey.sh b/etc/acpi/actions/hotkey.sh
index 1aac554..c6eeca2 100755
--- a/etc/acpi/actions/hotkey.sh
+++ b/etc/acpi/actions/hotkey.sh
@@ -97,11 +97,10 @@ case $code in
     # Fn+F2 -- toggle wireless
     0000001[01])
 	notify wireless 'Wireless ...'
-	KERNEL="`echo $KERNEL | sed -re 's/^([0-9]+\.){2}([0-9]+).*$/\2/'`"
-	if [ "$KERNEL" -lt 29 ]; then
-	  /etc/acpi/actions/wireless.sh toggle
+	if grep -q '^H.*\brfkill\b' /proc/bus/input/devices; then
+	  :
 	else
-	  sleep 2
+	  /etc/acpi/actions/wireless.sh toggle
 	fi
 	show_wireless
 	;;

-- 
Maintenance of eeepc-acpi-scripts debian package