[Debian-eeepc-commits] [SCM] Maintenance of eeepc-acpi-scripts debian package branch, rfkill, updated. 1.1.5-25-gdf57ab5

[Darren Salt]

The following commit has been merged in the rfkill branch:
commit 269985107d33b89551ed29f0cb1b017252373eb0
Merge: 316af4b7a94b7127d2824949e4e59d56f82e05be 206d7f696311669a30ffe42bf2f62b4629402082
Author: Darren Salt <linux at youmustbejoking.demon.co.uk>
Date:   Thu Jan 21 18:24:53 2010 +0000

    Merge branch 'master' into rfkill
    
    Conflicts:
    	etc/acpi/actions/wireless.sh

diff --combined debian/changelog
index 8fd0873,8f910d3..fda2f89
--- a/debian/changelog
+++ b/debian/changelog
@@@ -3,10 -3,13 +3,15 @@@ eeepc-acpi-scripts (1.1.7) UNRELEASED; 
    [ Damyan Ivanov ]
    * add a hook in /etc/pm/sleep.d that switches off wlan on suspend on models
      using RT2860
+   * wireless.sh: deconfigure wlan0 and remove the rt2860sta module before
+     switching off the hardware
+   * lid.sh/sleep.sh: remove checks for running powersaved. The checks can be
+     faked and powersaved was dropped from Debian. Partly addresses #565855.
  
    [ Darren Salt ]
+   * rfkill-input isn't present in kernel ≥ 2.6.31, so don't try loading it.
 +  * Abstract out rfkill setting & getting, ready for eventual use of
 +    /dev/rfkill.
  
   -- Darren Salt <linux at youmustbejoking.demon.co.uk>  Fri, 01 Jan 2010 21:16:09 +0000
  
diff --combined etc/acpi/actions/wireless.sh
index 782ba86,a1f5e88..a09ac0d
--- a/etc/acpi/actions/wireless.sh
+++ b/etc/acpi/actions/wireless.sh
@@@ -2,16 -2,14 +2,16 @@@
  
  . /usr/share/eeepc-acpi-scripts/functions.sh
  
 -detect_rfkill eeepc-wlan
 +detect_rfkill eeepc-wlan wlan
  wlan_control="$RFKILL"
  
 -[ -n "$wlan_control" -a -e $wlan_control ] \
 +if ! have_dev_rfkill; then
 +  [ -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
 +  [ -e "$wlan_control" ] || wlan_control=/proc/acpi/asus/wlan # pre-2.6.26
 +fi
  
 -STATE="$(cat $wlan_control)"
 +STATE="$(get_rfkill "$wlan_control")"
  
  cmd="$1"
  if [ "$cmd" = toggle ]; then
@@@ -24,13 -22,18 +24,18 @@@ case "$cmd" i
  	;;
      on|enable|1)
  	if [ "$STATE" = 0 ]; then
 -	    echo 1 > $wlan_control
 +	    set_rfkill "$wlan_control" 1
              wakeup_wicd
  	fi
  	;;
      off|disable|0)
  	if [ "$STATE" = 1 ]; then
+             # rt2860 needs to be idle when shut down
+             if lsmod | grep -q rt2860sta; then
+                 ifconfig wlan0 down || ifconfig ra0 down
+                 modprobe -r rt2860sta
+             fi
 -	    echo 0 > $wlan_control
 +	    set_rfkill "$wlan_control" 0
  	fi
  	;;
      *)

-- 
Maintenance of eeepc-acpi-scripts debian package