[Debian-eeepc-commits] [SCM] Maintenance of eeepc-acpi-scripts debian package branch, shengine, updated. 1.1.0-beta.1-13-gae1a86e

[Darren Salt]

The following commit has been merged in the shengine branch:
commit ae1a86e185fbe6539bde4727c555f7f5e97bf5ba
Author: Darren Salt <linux at youmustbejoking.demon.co.uk>
Date:   Sat May 30 14:22:26 2009 +0100

    Switch to ac_adapter events for S.H.E. handling.
    This allows handling on wake-up of adapter insertions & removals performed
    while suspended.

diff --git a/etc/acpi/actions/ac_adapter.sh b/etc/acpi/actions/ac_adapter.sh
new file mode 100755
index 0000000..fc6102d
--- /dev/null
+++ b/etc/acpi/actions/ac_adapter.sh
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+# do nothing if package is removed
+PKG=eeepc-acpi-scripts
+FUNC_LIB=/usr/share/$PKG/functions.sh
+DEFAULT=/etc/default/$PKG
+[ -e $FUNC_LIB ] || exit 0
+
+case $(runlevel) in
+    *0|*6)
+	exit 0
+	;;
+esac
+
+if [ -e "$DEFAULT" ]; then . "$DEFAULT"; fi
+. $FUNC_LIB
+
+. /etc/acpi/lib/notify.sh
+code="$3 $4"
+
+case "$code" in
+    # AC adapter present
+    0000008[01]\ 00000001)
+	. /etc/acpi/lib/shengine.sh
+	if [ "$SHENGINE_SETTING" = auto ]; then
+	    if [ "$PWR_CLOCK_AC" -a $(get_shengine -) -gt "$PWR_CLOCK_AC" ]; then
+		handle_shengine "$PWR_CLOCK_AC" -
+	    fi
+	fi
+	;;
+
+    # AC adapter not present
+    0000008[01]\ 00000000)
+	. /etc/acpi/lib/shengine.sh
+	if [ "$SHENGINE_SETTING" = auto ]; then
+	    if [ "$PWR_CLOCK_BATTERY" -a $(get_shengine -) -lt "$PWR_CLOCK_BATTERY" ]; then
+		handle_shengine "$PWR_CLOCK_BATTERY" -
+	    fi
+	fi
+	;;
+
+esac
diff --git a/etc/acpi/actions/hotkey.sh b/etc/acpi/actions/hotkey.sh
index 3f58d15..e2efddc 100755
--- a/etc/acpi/actions/hotkey.sh
+++ b/etc/acpi/actions/hotkey.sh
@@ -223,26 +223,4 @@ case $code in
 	fi
 	;;
 
-    # Other "hotkey" events
-
-    # AC adapter present
-    00000050)
-	. /etc/acpi/lib/shengine.sh
-	if [ "$SHENGINE_SETTING" = auto ]; then
-	    if [ "$PWR_CLOCK_AC" -a $(get_shengine -) -gt "$PWR_CLOCK_AC" ]; then
-		handle_shengine "$PWR_CLOCK_AC" -
-	    fi
-	fi
-	;;
-
-    # AC adapter not present
-    00000051)
-	. /etc/acpi/lib/shengine.sh
-	if [ "$SHENGINE_SETTING" = auto ]; then
-	    if [ "$PWR_CLOCK_BATTERY" -a $(get_shengine -) -lt "$PWR_CLOCK_BATTERY" ]; then
-		handle_shengine "$PWR_CLOCK_BATTERY" -
-	    fi
-	fi
-	;;
-
 esac
diff --git a/etc/acpi/events/ac_adapter_inserted b/etc/acpi/events/ac_adapter_inserted
new file mode 100644
index 0000000..8f520e5
--- /dev/null
+++ b/etc/acpi/events/ac_adapter_inserted
@@ -0,0 +1,2 @@
+event=ac_adapter .* 0000008[01] 00000001
+action=/etc/acpi/actions/hotkey.sh %e
diff --git a/etc/acpi/events/ac_adapter_removed b/etc/acpi/events/ac_adapter_removed
new file mode 100644
index 0000000..bc1ad2d
--- /dev/null
+++ b/etc/acpi/events/ac_adapter_removed
@@ -0,0 +1,2 @@
+event=ac_adapter .* 0000008[01] 00000000
+action=/etc/acpi/actions/hotkey.sh %e

-- 
Maintenance of eeepc-acpi-scripts debian package