diff -Nru acpi-support-0.109/acpi-support acpi-support-0.110/acpi-support --- acpi-support-0.109/acpi-support 2007-08-31 07:35:02.000000000 +0400 +++ acpi-support-0.110/acpi-support 2008-07-22 23:57:22.000000000 +0400 @@ -67,6 +67,3 @@ # Switch to laptop-mode on battery power - off by default as it causes odd # hangs on some machines ENABLE_LAPTOP_MODE=false - -# Spindown time on battery -SPINDOWN_TIME=12 \ No newline at end of file diff -Nru acpi-support-0.109/debian/changelog acpi-support-0.110/debian/changelog --- acpi-support-0.109/debian/changelog 2008-04-14 10:47:21.000000000 +0400 +++ acpi-support-0.110/debian/changelog 2008-07-23 00:00:16.000000000 +0400 @@ -1,3 +1,11 @@ +acpi-support (0.110) intrepid; urgency=low + + * Let laptop-mode-tools run properly + - power.sh: remove laptop-mode invocations, should be handled by pm-utils + - acpi-support: remove SPINDOWN_TIME, should be controlled by laptop-mode + + -- Alexey Borzenkov Tue, 22 Jul 2008 23:59:07 +0400 + acpi-support (0.109) hardy; urgency=low [ Daniel Hahler ] diff -Nru acpi-support-0.109/power.sh acpi-support-0.110/power.sh --- acpi-support-0.109/power.sh 2008-04-14 10:46:33.000000000 +0400 +++ acpi-support-0.110/power.sh 2008-07-22 23:57:04.000000000 +0400 @@ -3,36 +3,6 @@ . /etc/default/acpi-support . /usr/share/acpi-support/power-funcs -function laptop_mode_enable { - $LAPTOP_MODE start - - for x in /sys/bus/ide/devices/*/block*; do - drive=$(basename $(readlink $x)); - $HDPARM -S $SPINDOWN_TIME /dev/$drive 2>/dev/null - $HDPARM -B 1 /dev/$drive 2>/dev/null - done - - for x in /sys/bus/scsi/devices/*/block*; do - drive=$(basename $(readlink $x)); - $HDPARM -S $SPINDOWN_TIME /dev/$drive 2>/dev/null - $HDPARM -B 1 /dev/$drive 2>/dev/null - done -} - -function laptop_mode_disable { - for x in /sys/bus/ide/devices/*/block*; do - drive=$(basename $(readlink $x)); - $HDPARM -S 0 /dev/$drive 2>/dev/null - $HDPARM -B 255 /dev/$drive 2>/dev/null - done - for x in /sys/bus/scsi/devices/*/block*; do - drive=$(basename $(readlink $x)); - $HDPARM -S 0 /dev/$drive 2>/dev/null - $HDPARM -B 255 /dev/$drive 2>/dev/null - done - $LAPTOP_MODE stop -} - getState; checkStateChanged; @@ -46,15 +16,9 @@ for SCRIPT in /etc/acpi/battery.d/*.sh; do . $SCRIPT done - if [ x$ENABLE_LAPTOP_MODE = xtrue ]; then - (sleep 5 && laptop_mode_enable)& - fi else for SCRIPT in /etc/acpi/ac.d/*.sh; do . $SCRIPT done - if [ x$ENABLE_LAPTOP_MODE = xtrue ]; then - (sleep 5 && laptop_mode_disable)& - fi fi done