[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 c88bd57ce8d054e42e2931a18d65c3744a5bc535
Author: Darren Salt <linux at youmustbejoking.demon.co.uk>
Date:   Mon Jan 4 14:56:51 2010 +0000

    rfkill-input isn't present in kernel ≥ 2.6.31, so don't try loading it.

diff --git a/debian/changelog b/debian/changelog
index 6754d85..101553f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ eeepc-acpi-scripts (1.1.7) UNRELEASED; urgency=low
   * add a hook in /etc/pm/sleep.d that switches off wlan on suspend on models
     using RT2860
 
+  [ Darren Salt ]
+  * rfkill-input isn't present in kernel ≥ 2.6.31, so don't try loading it.
+
  -- Darren Salt <linux at youmustbejoking.demon.co.uk>  Fri, 01 Jan 2010 21:16:09 +0000
 
 eeepc-acpi-scripts (1.1.6) unstable; urgency=low
diff --git a/debian/eeepc-acpi-scripts.init b/debian/eeepc-acpi-scripts.init
index 81cab4c..f32ca73 100644
--- a/debian/eeepc-acpi-scripts.init
+++ b/debian/eeepc-acpi-scripts.init
@@ -85,9 +85,9 @@ case "$1" in
       fi
     fi
 
-    # Load rfkill-input if possible, i.e. kernel is 2.6.28 or newer.
+    # Load rfkill-input if possible, i.e. kernel is 2.6.28, .29 or .30.
     # This results in faster WLAN hw toggling.
-    if [ "$KERNEL" -ge 28 ]; then
+    if [ "$KERNEL" -ge 28 -a "$KERNEL" -le 30 ]; then
       if grep -q '^H.*\brfkill\b' /proc/bus/input/devices; then
 	:
       else

-- 
Maintenance of eeepc-acpi-scripts debian package