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

[Darren Salt]

The following commit has been merged in the master branch:
commit b764b55b94dbe8025402e09f8c8fce27ff4e8047
Author: Darren Salt <linux at youmustbejoking.demon.co.uk>
Date:   Tue Oct 13 15:15:39 2009 +0100

    Allow setting of whether the super hybrid engine defaults to manual or auto.

diff --git a/debian/changelog b/debian/changelog
index e5afd01..f2954f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ eeepc-acpi-scripts (1.1.3) UNRELEASED; urgency=low
     ensure that we default to "automatic" for our S.H.E. handling. 
   * Belatedly bump acpid version requirement. (Closes: #550119)
   * Bring the copyright file up to date.
+  * Allow setting of whether the super hybrid engine control defaults to
+    manual or auto.
 
   [ Damyan Ivanov ]
   * rules: call dh_installinit with -u'start 20 S .' to prevent
diff --git a/debian/eeepc-acpi-scripts.default b/debian/eeepc-acpi-scripts.default
index d45cde3..5b0d5e2 100644
--- a/debian/eeepc-acpi-scripts.default
+++ b/debian/eeepc-acpi-scripts.default
@@ -138,3 +138,9 @@ FnF_VOLUMEUP='handle_volume_up'
 # '' = fastest (AC) or slowest (battery)
 PWR_CLOCK_AC=
 PWR_CLOCK_BATTERY=
+# The current state is stored by the BIOS. However, we still have to handle
+# "auto" vs. "manual"; this is stored in /var/lib/eeepc-acpi-scripts/cpufv.
+# You can use DEFAULT_SHENGINE_CONFIG to provide a setting for when this
+# file is missing (which, initially, it will be); if you don't, "auto" mode
+# will be chosen for you.
+#DEFAULT_SHENGINE_CONFIG=manual
diff --git a/etc/acpi/lib/shengine.sh b/etc/acpi/lib/shengine.sh
index ba91a70..54bb436 100644
--- a/etc/acpi/lib/shengine.sh
+++ b/etc/acpi/lib/shengine.sh
@@ -1,6 +1,7 @@
 # a shell library for handling Asus EeePC "Super Hybrid Engine"
 #
 # to be sourced
+# requires that the defaults file has been sourced
 
 SHENGINE_CTL=/sys/devices/platform/eeepc/cpufv
 SHENGINE_LIMIT="$(cat "$SHENGINE_CTL" 2>/dev/null || :)"
@@ -8,6 +9,7 @@ SHENGINE_LIMIT=$(( ${SHENGINE_LIMIT:-768} >> 8 ))
 
 SHENGINE_CONFIG=/var/lib/eeepc-acpi-scripts/cpufv
 SHENGINE_SETTING="$(cat "$SHENGINE_CONFIG" 2>/dev/null || :)"
+SHENGINE_SETTING=${SHENGINE_SETTING:-$DEFAULT_SHENGINE_CONFIG}
 
 get_shengine()
 {

-- 
Maintenance of eeepc-acpi-scripts debian package