- release 2.3

[packages/acpid.git] / acpid.init

diff --git a/acpid.init b/acpid.init
index eefcad386dced0a15df1d95132269221b3db732d..d863142cd3eb014f0ca4a30ef681a20a17ee6d56 100644 (file)
--- a/acpid.init
+++ b/acpid.init
@@ -11,6 +11,12 @@
 # Source function library.
 . /etc/rc.d/init.d/functions
 
+# Initial values (just in case):
+LAPTOP_MODULES=""
+VARIOUS_MODULES=""
+ASUS_LAPTOP=""
+TOSHIBA_LAPTOP=""
+
 # Configuration file.
 . /etc/sysconfig/acpid
 
@@ -21,13 +27,31 @@ case "$1" in
   start)
        # Start daemons.
        if [ ! -f /var/lock/subsys/acpid ]; then
-               if [ ! -f /proc/acpi/event ]; then
-                       _modprobe single ospm_button
+               if [ ! -d /proc/acpi/button ]; then
+                       _modprobe ospm_button
+                       _modprobe button
                fi
                if is_yes "$MODPROBE_OSPM_SYSTEM"; then
                        _modprobe single ospm_system
                fi
+               # starting:
                msg_starting acpid $PROGRAM_ARGS
+               # Load additional modules:
+               if [ -z "$LAPTOP_MODULES" ]; then
+                       for i in "$LAPTOP_MODULES"; do
+                               _modprobe single $i
+                       done
+               elif [ -z "$VARIOUS_MODULES" ] then
+                       for i in "$VARIOUS_MODULES"; do
+                               _modprobe single $i
+                       done
+               fi
+               # Determine if it's ASUS or TOSHIBA laptop
+               if is_yes "$ASUS_LAPTOP"; then
+                       _modprobe asus_acpi
+               elif is_yes "$TOSHIBA_LAPTOP"; then
+                       _modprobe toshiba_acpi
+               fi
                daemon acpid
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/acpid