diff -Nru acpi-support-0.121/debian/changelog acpi-support-0.122/debian/changelog --- acpi-support-0.121/debian/changelog 2009-03-25 15:49:19.000000000 -0400 +++ acpi-support-0.122/debian/changelog 2009-04-27 10:08:47.000000000 -0400 @@ -1,3 +1,19 @@ +acpi-support (0.122) karmic; urgency=low + + * sleep.sh, hibernate.sh: + - Don't use custom suspend/hibernate solution. Instead, call pm-utils. + LP: #366119 + * prepare.sh, resume.sh, resume.d, suspend.d: + - Delete; no longer used + * debian/dirs, debian/rules: + - Don't install resume.d and suspend.d directories + * debian/control: + - Depend on pm-utils + * debian/preinst: + - Remove any existing resume.d and suspend.d files. + + -- Michael Terry Mon, 27 Apr 2009 10:08:23 -0400 + acpi-support (0.121) jaunty; urgency=low * Remove /etc/modprobe.d/ibm_acpi.modprobe in case it's still present; diff -Nru acpi-support-0.121/debian/control acpi-support-0.122/debian/control --- acpi-support-0.121/debian/control 2009-03-25 15:49:19.000000000 -0400 +++ acpi-support-0.122/debian/control 2009-04-27 09:52:12.000000000 -0400 @@ -13,7 +13,7 @@ Package: acpi-support Architecture: i386 amd64 ia64 lpia -Depends: x11-xserver-utils, laptop-mode-tools, acpid (>= 1.0.4-1ubuntu4), hdparm, lsb-base (>= 1.3-9ubuntu3), ${arch:Depends}, finger, powermgmt-base, laptop-detect, dmidecode (>= 2.7-1), ${shlibs:Depends} +Depends: x11-xserver-utils, laptop-mode-tools, acpid (>= 1.0.4-1ubuntu4), hdparm, lsb-base (>= 1.3-9ubuntu3), ${arch:Depends}, finger, powermgmt-base, laptop-detect, dmidecode (>= 2.7-1), ${shlibs:Depends}, pm-utils Recommends: toshset, radeontool Conflicts: uswsusp (<= 0.2) Suggests: laptop-mode-tools diff -Nru acpi-support-0.121/debian/dirs acpi-support-0.122/debian/dirs --- acpi-support-0.121/debian/dirs 2009-03-25 15:49:19.000000000 -0400 +++ acpi-support-0.122/debian/dirs 2009-04-27 09:44:12.000000000 -0400 @@ -1,7 +1,5 @@ etc/acpi etc/acpi/events -etc/acpi/suspend.d -etc/acpi/resume.d etc/acpi/start.d etc/acpi/ac.d etc/acpi/battery.d diff -Nru acpi-support-0.121/debian/preinst acpi-support-0.122/debian/preinst --- acpi-support-0.121/debian/preinst 2009-03-25 15:49:19.000000000 -0400 +++ acpi-support-0.122/debian/preinst 2009-04-27 09:58:24.000000000 -0400 @@ -64,6 +64,45 @@ if dpkg --compare-versions "$2" lt-nl "0.121"; then rm_conffile acpi-support /etc/modprobe.d/ibm_acpi.modprobe fi + if dpkg --compare-versions "$2" lt-nl "0.122"; then + # Mass removal of suspend.d and resume.d hooks + rm_conffile acpi-support /etc/acpi/resume.d/10-thinkpad-standby-led.sh + rm_conffile acpi-support /etc/acpi/resume.d/13-855-resolution-set.sh + rm_conffile acpi-support /etc/acpi/resume.d/15-video-post.sh + rm_conffile acpi-support /etc/acpi/resume.d/35-modules-load.sh + rm_conffile acpi-support /etc/acpi/resume.d/40-infra-red.sh + rm_conffile acpi-support /etc/acpi/resume.d/49-855-resolution-set.sh + rm_conffile acpi-support /etc/acpi/resume.d/50-framebuffer-enable.sh + rm_conffile acpi-support /etc/acpi/resume.d/50-tosh-restore-brightness.sh + rm_conffile acpi-support /etc/acpi/resume.d/55-screen.sh + rm_conffile acpi-support /etc/acpi/resume.d/58-proc-sysfs-restore-state.sh + rm_conffile acpi-support /etc/acpi/resume.d/60-asus-wireless-led.sh + rm_conffile acpi-support /etc/acpi/resume.d/62-ifup.sh + rm_conffile acpi-support /etc/acpi/resume.d/65-console.sh + rm_conffile acpi-support /etc/acpi/resume.d/67-sound.sh + rm_conffile acpi-support /etc/acpi/resume.d/69-services.sh + rm_conffile acpi-support /etc/acpi/resume.d/72-acpi-pain.sh + rm_conffile acpi-support /etc/acpi/resume.d/85-anacron.sh + rm_conffile acpi-support /etc/acpi/resume.d/90-hdparm.sh + rm_conffile acpi-support /etc/acpi/resume.d/90-thinkpad-unstandby-led.sh + rm_conffile acpi-support /etc/acpi/resume.d/90-xscreensaver.sh + rm_conffile acpi-support /etc/acpi/resume.d/98-acpi-unlock.sh + rm_conffile acpi-support /etc/acpi/suspend.d/05-acpi-lock.sh + rm_conffile acpi-support /etc/acpi/suspend.d/10-thinkpad-standby-led.sh + rm_conffile acpi-support /etc/acpi/suspend.d/15-anacron.sh + rm_conffile acpi-support /etc/acpi/suspend.d/30-proc-sysfs-save-state.sh + rm_conffile acpi-support /etc/acpi/suspend.d/50-irda-stop.sh + rm_conffile acpi-support /etc/acpi/suspend.d/50-tosh-save-brightness.sh + rm_conffile acpi-support /etc/acpi/suspend.d/55-down-interfaces.sh + rm_conffile acpi-support /etc/acpi/suspend.d/60-generate-modules-list.sh + rm_conffile acpi-support /etc/acpi/suspend.d/65-services-stop.sh + rm_conffile acpi-support /etc/acpi/suspend.d/70-modules-unload.sh + rm_conffile acpi-support /etc/acpi/suspend.d/75-console-switch.sh + rm_conffile acpi-support /etc/acpi/suspend.d/85-alsa-state.sh + rm_conffile acpi-support /etc/acpi/suspend.d/90-framebuffer-stop.sh + rmdir --ignore-fail-on-non-empty /etc/acpi/resume.d + rmdir --ignore-fail-on-non-empty /etc/acpi/suspend.d + fi esac diff -Nru acpi-support-0.121/debian/rules acpi-support-0.122/debian/rules --- acpi-support-0.121/debian/rules 2009-03-25 15:49:19.000000000 -0400 +++ acpi-support-0.122/debian/rules 2009-04-27 09:45:06.000000000 -0400 @@ -27,12 +27,6 @@ for file in events/*; do\ install -m 644 $$file debian/acpi-support/etc/acpi/events/;\ done - for file in suspend.d/*.sh; do\ - install -m 755 $$file debian/acpi-support/etc/acpi/suspend.d/;\ - done - for file in resume.d/*.sh; do\ - install -m 755 $$file debian/acpi-support/etc/acpi/resume.d/;\ - done for file in start.d/*.sh; do\ install -m 755 $$file debian/acpi-support/etc/acpi/start.d/;\ done diff -Nru acpi-support-0.121/hibernate.sh acpi-support-0.122/hibernate.sh --- acpi-support-0.121/hibernate.sh 2009-03-25 15:49:19.000000000 -0400 +++ acpi-support-0.122/hibernate.sh 2009-04-27 09:40:34.000000000 -0400 @@ -4,44 +4,9 @@ test -f /usr/share/acpi-support/state-funcs || exit 0 . /etc/default/acpi-support -. /usr/share/acpi-support/power-funcs -. /usr/share/acpi-support/policy-funcs if [ x$ACPI_HIBERNATE != xtrue ] && [ x$1 != xforce ]; then exit; fi -# Unset video posting - it's not needed for suspend to disk -unset POST_VIDEO -unset USE_DPMS - -. /etc/acpi/prepare.sh - -#if [ x$LOCK_SCREEN = xtrue ]; then -# for x in /tmp/.X11-unix/*; do -# displaynum=`echo $x | sed s#/tmp/.X11-unix/X##` -# getXuser; -# if [ x"$XAUTHORITY" != x"" ]; then -# export DISPLAY=":$displaynum" -# . /usr/share/acpi-support/screenblank -# fi -# done -#fi - -echo -n $HIBERNATE_MODE >/sys/power/disk - -if [ -x /sbin/s2disk ]; then - DEVICE="/dev/disk/by-uuid/`awk -F= '{print $3}' /sys/power/state -fi - -$LAPTOP_MODE stop - -. /etc/acpi/resume.sh +pm-hibernate diff -Nru acpi-support-0.121/prepare.sh acpi-support-0.122/prepare.sh --- acpi-support-0.121/prepare.sh 2009-03-25 15:49:19.000000000 -0400 +++ acpi-support-0.122/prepare.sh 1969-12-31 19:00:00.000000000 -0500 @@ -1,9 +0,0 @@ -#!/bin/sh - -test -f /usr/share/acpi-support/key-constants || exit 0 - -for SCRIPT in /etc/acpi/suspend.d/*.sh; do - if [ -x $SCRIPT ] ; then - . $SCRIPT - fi -done diff -Nru acpi-support-0.121/resume.d/10-thinkpad-standby-led.sh acpi-support-0.122/resume.d/10-thinkpad-standby-led.sh --- acpi-support-0.121/resume.d/10-thinkpad-standby-led.sh 2009-03-25 15:49:19.000000000 -0400 +++ acpi-support-0.122/resume.d/10-thinkpad-standby-led.sh 1969-12-31 19:00:00.000000000 -0500 @@ -1,4 +0,0 @@ -#!/bin/sh - -. /usr/share/acpi-support/state-funcs -setLEDThinkpadSuspending 1 diff -Nru acpi-support-0.121/resume.d/13-855-resolution-set.sh acpi-support-0.122/resume.d/13-855-resolution-set.sh --- acpi-support-0.121/resume.d/13-855-resolution-set.sh 2009-03-25 15:49:19.000000000 -0400 +++ acpi-support-0.122/resume.d/13-855-resolution-set.sh 1969-12-31 19:00:00.000000000 -0500 @@ -1,8 +0,0 @@ -#!/bin/bash - -if [ -x /usr/sbin/855resolution ]; then - . /etc/default/855resolution - if [ "$MODE" != "" ] && [ "$XRESO" != "" ] && [ "$YRESO" != "" ]; then - /etc/init.d/855resolution start; - fi -fi diff -Nru acpi-support-0.121/resume.d/15-video-post.sh acpi-support-0.122/resume.d/15-video-post.sh --- acpi-support-0.121/resume.d/15-video-post.sh 2009-03-25 15:49:19.000000000 -0400 +++ acpi-support-0.122/resume.d/15-video-post.sh 1969-12-31 19:00:00.000000000 -0500 @@ -1,7 +0,0 @@ -#!/bin/sh - -# Post the video card -if [ x$POST_VIDEO = xtrue ]; then - vbetool post -fi - diff -Nru acpi-support-0.121/resume.d/35-modules-load.sh acpi-support-0.122/resume.d/35-modules-load.sh --- acpi-support-0.121/resume.d/35-modules-load.sh 2009-03-25 15:49:19.000000000 -0400 +++ acpi-support-0.122/resume.d/35-modules-load.sh 1969-12-31 19:00:00.000000000 -0500 @@ -1,21 +0,0 @@ -#!/bin/sh - -# Increase the firmware loading timeout while we're doing this -# Otherwise, swap thrash tends to lead to failure to start -if [ -f /sys/class/firmware/timeout ]; then - timeout=`cat /sys/class/firmware/timeout` - echo 100 >/sys/class/firmware/timeout -fi - -# Load any drivers that we removed -for x in $MODULES; do - modprobe $x; -done - -# And reset the firmware timeout -if [ -f /sys/class/firmware/timeout ]; then - echo $timeout >/sys/class/firmware/timeout -fi - -# And bring back PCMCIA code -[ -x /sbin/pccardctl ] && pccardctl insert diff -Nru acpi-support-0.121/resume.d/40-infra-red.sh acpi-support-0.122/resume.d/40-infra-red.sh --- acpi-support-0.121/resume.d/40-infra-red.sh 2009-03-25 15:49:19.000000000 -0400 +++ acpi-support-0.122/resume.d/40-infra-red.sh 1969-12-31 19:00:00.000000000 -0500 @@ -1,9 +0,0 @@ -#!/bin/sh - -# Restart IR if necessary -if [ -f /var/run/irdadev ] && [ x$RESTART_IRDA = xtrue ]; then - rm /var/run/irdadev; - /etc/init.d/irda-setup start; - /etc/init.d/irda-utils start; -fi; - diff -Nru acpi-support-0.121/resume.d/49-855-resolution-set.sh acpi-support-0.122/resume.d/49-855-resolution-set.sh --- acpi-support-0.121/resume.d/49-855-resolution-set.sh 2009-03-25 15:49:19.000000000 -0400 +++ acpi-support-0.122/resume.d/49-855-resolution-set.sh 1969-12-31 19:00:00.000000000 -0500 @@ -1,8 +0,0 @@ -#!/bin/bash - -if [ -x /usr/sbin/855resolution ]; then - . /etc/default/855resolution - if [ "$MODE" != "" ] && [ "$XRESO" != "" ] && [ "$YRESO" != "" ]; then - /etc/init.d/855resolution start; - fi -fi diff -Nru acpi-support-0.121/resume.d/50-framebuffer-enable.sh acpi-support-0.122/resume.d/50-framebuffer-enable.sh --- acpi-support-0.121/resume.d/50-framebuffer-enable.sh 2009-03-25 15:49:19.000000000 -0400 +++ acpi-support-0.122/resume.d/50-framebuffer-enable.sh 1969-12-31 19:00:00.000000000 -0500 @@ -1,9 +0,0 @@ -#!/bin/sh - -# And turn the framebuffer back on -for x in /sys/class/graphics/*; do - if [ -f $x/state ]; then - echo -n 0 >$x/state; - fi -done - diff -Nru acpi-support-0.121/resume.d/50-tosh-restore-brightness.sh acpi-support-0.122/resume.d/50-tosh-restore-brightness.sh --- acpi-support-0.121/resume.d/50-tosh-restore-brightness.sh 2009-03-25 15:49:19.000000000 -0400 +++ acpi-support-0.122/resume.d/50-tosh-restore-brightness.sh 1969-12-31 19:00:00.000000000 -0500 @@ -1,12 +0,0 @@ -#!/bin/sh - -if [ "x$TOSH_BRIGHTNESS" != "x" ]; then - # To reset the brightness... - echo 'brightness : '$TOSH_MAXBRIGHT > $TOSH_LCD - echo 'brightness : 0' > $TOSH_LCD - # And then restore it... - echo 'brightness : '$TOSH_BRIGHTNESS > $TOSH_LCD - unset TOSH_BRIGHTNESS TOSH_MAXBRIGHT -fi - -unset TOSH_LCD diff -Nru acpi-support-0.121/resume.d/55-screen.sh acpi-support-0.122/resume.d/55-screen.sh --- acpi-support-0.121/resume.d/55-screen.sh 2009-03-25 15:49:19.000000000 -0400 +++ acpi-support-0.122/resume.d/55-screen.sh 1969-12-31 19:00:00.000000000 -0500 @@ -1,7 +0,0 @@ -#!/bin/sh - -# And make sure that the screen is on -if [ x$USE_DPMS = xtrue ]; then - vbetool dpms on -fi - diff -Nru acpi-support-0.121/resume.d/58-proc-sysfs-restore-state.sh acpi-support-0.122/resume.d/58-proc-sysfs-restore-state.sh --- acpi-support-0.121/resume.d/58-proc-sysfs-restore-state.sh 2009-03-25 15:49:19.000000000 -0400 +++ acpi-support-0.122/resume.d/58-proc-sysfs-restore-state.sh 1969-12-31 19:00:00.000000000 -0500 @@ -1,12 +0,0 @@ -#!/bin/sh -# Paul Sladen 2007-03-22 -# Restore saved /sys and /proc states following resume. -# See suspend.d/??-proc-sysfs-restore-state.sh for details. - -if [ -r /var/run/proc-sysfs-save-state ] ; then - while read WHERE foo WHAT ; do - if [ "x$foo" = "x=" -a -w "$WHERE" ] ; then - echo -n "$WHAT" > "$WHERE" - fi - done < /var/run/proc-sysfs-save-state -fi diff -Nru acpi-support-0.121/resume.d/60-asus-wireless-led.sh acpi-support-0.122/resume.d/60-asus-wireless-led.sh --- acpi-support-0.121/resume.d/60-asus-wireless-led.sh 2009-03-25 15:49:19.000000000 -0400 +++ acpi-support-0.122/resume.d/60-asus-wireless-led.sh 1969-12-31 19:00:00.000000000 -0500 @@ -1,9 +0,0 @@ -#!/bin/sh -. /usr/share/acpi-support/state-funcs -if isAnyWirelessPoweredOn ; then - setLEDAsusWireless 1 -else - setLEDAsusWireless 0 -fi - - \ No newline at end of file diff -Nru acpi-support-0.121/resume.d/62-ifup.sh acpi-support-0.122/resume.d/62-ifup.sh --- acpi-support-0.121/resume.d/62-ifup.sh 2009-03-25 15:49:19.000000000 -0400 +++ acpi-support-0.122/resume.d/62-ifup.sh 1969-12-31 19:00:00.000000000 -0500 @@ -1,11 +0,0 @@ -#!/bin/sh - -# Bring up the interfaces. This should probably be left up to some policy -# manager, but at the moment we just bring back all the ifupdown-managed -# interfaces that were up at suspend time. -for x in $IFUP_INTERFACES; do - if must_control_interface $x ; then - ifup $x & - fi -done - diff -Nru acpi-support-0.121/resume.d/65-console.sh acpi-support-0.122/resume.d/65-console.sh --- acpi-support-0.121/resume.d/65-console.sh 2009-03-25 15:49:19.000000000 -0400 +++ acpi-support-0.122/resume.d/65-console.sh 1969-12-31 19:00:00.000000000 -0500 @@ -1,9 +0,0 @@ -#!/bin/sh - -# Some hardware needs another X/console switch in order to bring stuff back -chvt $CONSOLE; -if [ x$DOUBLE_CONSOLE_SWITCH = xtrue ]; then - chvt 12; - chvt $CONSOLE; -fi - diff -Nru acpi-support-0.121/resume.d/67-sound.sh acpi-support-0.122/resume.d/67-sound.sh --- acpi-support-0.121/resume.d/67-sound.sh 2009-03-25 15:49:19.000000000 -0400 +++ acpi-support-0.122/resume.d/67-sound.sh 1969-12-31 19:00:00.000000000 -0500 @@ -1,7 +0,0 @@ -#!/bin/sh - -# Get sound back -if [ -x /etc/init.d/alsa-utils ]; then - /etc/init.d/alsa-utils start -fi - diff -Nru acpi-support-0.121/resume.d/69-services.sh acpi-support-0.122/resume.d/69-services.sh --- acpi-support-0.121/resume.d/69-services.sh 2009-03-25 15:49:19.000000000 -0400 +++ acpi-support-0.122/resume.d/69-services.sh 1969-12-31 19:00:00.000000000 -0500 @@ -1,7 +0,0 @@ -#!/bin/sh - -# we need to restart our services after the network is back -for x in $STOP_SERVICES; do - invoke-rc.d --quiet $x start -done - diff -Nru acpi-support-0.121/resume.d/72-acpi-pain.sh acpi-support-0.122/resume.d/72-acpi-pain.sh --- acpi-support-0.121/resume.d/72-acpi-pain.sh 2009-03-25 15:49:19.000000000 -0400 +++ acpi-support-0.122/resume.d/72-acpi-pain.sh 1969-12-31 19:00:00.000000000 -0500 @@ -1,35 +0,0 @@ -#!/bin/sh - -# Some hardware gets unhappy about button events unless we do this -modprobe -r button -modprobe button - -# Kick the fans -modprobe -r fan -modprobe -r thermal -modprobe fan -modprobe thermal - -if [ "`grep thinkpad_acpi /proc/modules`" ]; then - # No, I don't know why - modprobe -r thinkpad_acpi - modprobe thinkpad_acpi -fi - -# NNGH FAN HATE -for x in /proc/acpi/fan/*; do - if [ -f "$x/state" ] && [ "`grep on $x/state`" ]; then - echo -n 3 > $x/state; - echo -n 0 > $x/state; - fi -done - -# Make sure that the drive power state is set correctly again -modprobe -r acpi_sbs -modprobe -r ac -modprobe ac -modprobe -r battery -modprobe battery -modprobe acpi_sbs -/etc/acpi/power.sh - diff -Nru acpi-support-0.121/resume.d/90-hdparm.sh acpi-support-0.122/resume.d/90-hdparm.sh --- acpi-support-0.121/resume.d/90-hdparm.sh 2009-03-25 15:49:19.000000000 -0400 +++ acpi-support-0.122/resume.d/90-hdparm.sh 1969-12-31 19:00:00.000000000 -0500 @@ -1,41 +0,0 @@ -#! /bin/sh -# -# This script adjusts hard drive APM settings using hdparm. The hardware -# defaults (usually hdparm -B 128) cause excessive head load/unload cycles -# on many modern hard drives. We therefore set hdparm -B 254 while on AC -# power. On battery we set hdparm -B 128, because the head parking is -# very useful for shock protection. -# - -. /usr/share/acpi-support/power-funcs - -DO_HDPARM=y -if [ -e /usr/sbin/laptop_mode ] ; then - LMT_CONTROL_HD_POWERMGMT=$(. /etc/laptop-mode/laptop-mode.conf && echo "$CONTROL_HD_POWERMGMT") - if [ "$LMT_CONTROL_HD_POWERMGMT" != 0 ] \ - && [ -e /var/run/laptop-mode-tools/enabled ] - then - # Laptop mode controls hdparm -B settings, we don't. - DO_HDPARM=n - fi -fi - -if [ "$DO_HDPARM" = y ] ; then - # Get the power state into STATE - getState; - - for dev in /dev/sd? /dev/hd? ; do - if [ -b $dev ] ; then - # Check for APM support; discard errors since not all drives - # support HDIO_GET_IDENTITY (-i). - if hdparm -i $dev 2> /dev/null | grep -q 'AdvancedPM=yes' ; then - if [ "$STATE" = "BATTERY" ] ; then - hdparm -B 128 $dev - else - hdparm -B 254 $dev - fi - fi - fi - done -fi - diff -Nru acpi-support-0.121/resume.d/90-thinkpad-unstandby-led.sh acpi-support-0.122/resume.d/90-thinkpad-unstandby-led.sh --- acpi-support-0.121/resume.d/90-thinkpad-unstandby-led.sh 2009-03-25 15:49:19.000000000 -0400 +++ acpi-support-0.122/resume.d/90-thinkpad-unstandby-led.sh 1969-12-31 19:00:00.000000000 -0500 @@ -1,3 +0,0 @@ -#!/bin/sh -. /usr/share/acpi-support/state-funcs -setLEDThinkpadSuspending 0 diff -Nru acpi-support-0.121/resume.d/90-xscreensaver.sh acpi-support-0.122/resume.d/90-xscreensaver.sh --- acpi-support-0.121/resume.d/90-xscreensaver.sh 2009-03-25 15:49:19.000000000 -0400 +++ acpi-support-0.122/resume.d/90-xscreensaver.sh 1969-12-31 19:00:00.000000000 -0500 @@ -1,13 +0,0 @@ -#!/bin/sh - -# now, we should poke xscreensaver so you get a dialog -if pidof xscreensaver > /dev/null; then - for x in /tmp/.X11-unix/*; do - displaynum=`echo $x | sed s#/tmp/.X11-unix/X##` - getXuser; - if [ x"$XAUTHORITY" != x"" ]; then - export DISPLAY=":$displaynum" - su $user -c "(xscreensaver-command -deactivate)" - fi - done -fi diff -Nru acpi-support-0.121/resume.d/98-acpi-unlock.sh acpi-support-0.122/resume.d/98-acpi-unlock.sh --- acpi-support-0.121/resume.d/98-acpi-unlock.sh 2009-03-25 15:49:19.000000000 -0400 +++ acpi-support-0.122/resume.d/98-acpi-unlock.sh 1969-12-31 19:00:00.000000000 -0500 @@ -1,5 +0,0 @@ -#!/bin/sh - -#Let acpid process events again -(sleep 10 && rm /var/lock/acpisleep)& - diff -Nru acpi-support-0.121/resume.sh acpi-support-0.122/resume.sh --- acpi-support-0.121/resume.sh 2009-03-25 15:49:19.000000000 -0400 +++ acpi-support-0.122/resume.sh 1969-12-31 19:00:00.000000000 -0500 @@ -1,10 +0,0 @@ -#!/bin/sh - -test -f /usr/share/acpi-support/key-constants || exit 0 - -# Source from /etc/acpi/resume.d/ -for SCRIPT in /etc/acpi/resume.d/*.sh; do - if [ -x $SCRIPT ] ; then - . $SCRIPT - fi -done diff -Nru acpi-support-0.121/sleep.sh acpi-support-0.122/sleep.sh --- acpi-support-0.121/sleep.sh 2009-03-25 15:49:19.000000000 -0400 +++ acpi-support-0.122/sleep.sh 2009-04-27 09:37:42.000000000 -0400 @@ -39,26 +39,4 @@ fi fi -# Generic preparation code -. /etc/acpi/prepare.sh - -if [ x$DISABLE_DMA = xtrue ] && [ -b /dev/hda ]; then - hdparm -d 0 /dev/hda -fi - -echo -n $ACPI_SLEEP_MODE >/sys/power/state - -if [ x$RESET_DRIVE = xtrue ] && [ -b /dev/hda ]; then - hdparm -w /dev/hda - hdparm -C /dev/hda - hdparm -C /dev/hda - hdparm -C /dev/hda - hdparm -d 1 /dev/hda -fi - -if [ x$DISABLE_DMA = xtrue ] && [ -b /dev/hda ]; then - hdparm -d 1 /dev/hda -fi - -# Generic wakeup code -. /etc/acpi/resume.sh +pm-suspend diff -Nru acpi-support-0.121/suspend.d/05-acpi-lock.sh acpi-support-0.122/suspend.d/05-acpi-lock.sh --- acpi-support-0.121/suspend.d/05-acpi-lock.sh 2009-03-25 15:49:19.000000000 -0400 +++ acpi-support-0.122/suspend.d/05-acpi-lock.sh 1969-12-31 19:00:00.000000000 -0500 @@ -1,5 +0,0 @@ -#!/bin/sh - -#prevent acpid from processing any following events -touch /var/lock/acpisleep - diff -Nru acpi-support-0.121/suspend.d/10-thinkpad-standby-led.sh acpi-support-0.122/suspend.d/10-thinkpad-standby-led.sh --- acpi-support-0.121/suspend.d/10-thinkpad-standby-led.sh 2009-03-25 15:49:19.000000000 -0400 +++ acpi-support-0.122/suspend.d/10-thinkpad-standby-led.sh 1969-12-31 19:00:00.000000000 -0500 @@ -1,4 +0,0 @@ -#!/bin/sh - -. /usr/share/acpi-support/state-funcs -setLEDThinkpadSuspending 1 diff -Nru acpi-support-0.121/suspend.d/30-proc-sysfs-save-state.sh acpi-support-0.122/suspend.d/30-proc-sysfs-save-state.sh --- acpi-support-0.121/suspend.d/30-proc-sysfs-save-state.sh 2009-03-25 15:49:19.000000000 -0400 +++ acpi-support-0.122/suspend.d/30-proc-sysfs-save-state.sh 1969-12-31 19:00:00.000000000 -0500 @@ -1,24 +0,0 @@ -#!/bin/sh -# Paul Sladen 2007-03-22 -# Save the state of various things that the kernel does not, or cannot -# maintain over the course of a suspend/resume or suspend/hibernate -# cycle. Lines are written into '/var/run/proc-sysfs-save-state' in -# the format: -# /sys/foo/bar/moo = XYZ - -if [ -d /var/run -a -w /var/run ] ; then - ( - for i in /sys/class/net/*/device/rf_kill /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor ; do - if [ -r "$i" ] ; then - echo -n "$i = " ; cat "$i" - fi - done - - i=/proc/acpi/ibm/bluetooth - if [ -r $i ] ; then - echo -n "$i = " - grep -q disabled /proc/acpi/ibm/bluetooth && echo disable || echo enable - fi - ) > /var/run/proc-sysfs-save-state -fi - diff -Nru acpi-support-0.121/suspend.d/50-irda-stop.sh acpi-support-0.122/suspend.d/50-irda-stop.sh --- acpi-support-0.121/suspend.d/50-irda-stop.sh 2009-03-25 15:49:19.000000000 -0400 +++ acpi-support-0.122/suspend.d/50-irda-stop.sh 1969-12-31 19:00:00.000000000 -0500 @@ -1,8 +0,0 @@ -#!/bin/sh - -# Stop IRDA if it's running -if [ -f /var/run/irattach.pid ]; then - /etc/init.d/irda-utils stop - killall -9 irattach -fi - diff -Nru acpi-support-0.121/suspend.d/50-tosh-save-brightness.sh acpi-support-0.122/suspend.d/50-tosh-save-brightness.sh --- acpi-support-0.121/suspend.d/50-tosh-save-brightness.sh 2009-03-25 15:49:19.000000000 -0400 +++ acpi-support-0.122/suspend.d/50-tosh-save-brightness.sh 1969-12-31 19:00:00.000000000 -0500 @@ -1,11 +0,0 @@ -#!/bin/sh - -TOSH_LCD=/proc/acpi/toshiba/lcd - -if [ -e $TOSH_LCD ]; then - TOSH_BRIGHTNESS=$(( `grep brightness: $TOSH_LCD | cut -d: -f2` + 0 )) - TOSH_MAXBRIGHT=$(( `grep brightness_levels: $TOSH_LCD | cut -d: -f2` - 1)) - # Turn brightness to max to make bios password prompt easier to see - echo 'brightness : '$TOSH_MAXBRIGHT > $TOSH_LCD -fi - diff -Nru acpi-support-0.121/suspend.d/55-down-interfaces.sh acpi-support-0.122/suspend.d/55-down-interfaces.sh --- acpi-support-0.121/suspend.d/55-down-interfaces.sh 2009-03-25 15:49:19.000000000 -0400 +++ acpi-support-0.122/suspend.d/55-down-interfaces.sh 1969-12-31 19:00:00.000000000 -0500 @@ -1,46 +0,0 @@ -#!/bin/sh - -pccardctl eject - -# Get rid of any currently running dhclients -killall dhclient dhclient3 2>/dev/null - -# First do all network interfaces that were brought up by ifupdown. These are -# the only interfaces that we bring up on resume (the other ones are probably -# managed by other tools, such as NetworkManager, and will be brought up -# automatically). Due to logical interfaces, the interfaces that we pass to -# ifdown are DIFFERENT than those that we pass to ifup, see Debian BTS #475002. -IFDOWN_INTERFACES="`cat /var/run/network/ifstate | sed 's/=.*//'`" -IFUP_INTERFACES="`cat /var/run/network/ifstate`" - -must_control_interface() -{ - # Always skip lo - test "$1" = "lo" && return 1 - for i in $SKIP_INTERFACES; do - # Skip if listed in $SKIP_INTERFACES - echo "$1" | grep -q "^$i" && return 1 - done - return 0 -} - - -# Shut down the interfaces (except lo, which can and should be kept up) -for x in $IFDOWN_INTERFACES; do - if must_control_interface $x ; then - ifdown $x - fi -done - -# TODO: Tell NetworkManager to shut down networking at this point - -# Find the remaining running network interfaces... -INTERFACES=`/sbin/ifconfig | awk '/^[^ ]+/ {print $1}'` - -# And shut them down (except lo, which can and should be kept up) -for x in $INTERFACES; do - if must_control_interface $x ; then - ifconfig $x down - fi -done - diff -Nru acpi-support-0.121/suspend.d/60-generate-modules-list.sh acpi-support-0.122/suspend.d/60-generate-modules-list.sh --- acpi-support-0.121/suspend.d/60-generate-modules-list.sh 2009-03-25 15:49:19.000000000 -0400 +++ acpi-support-0.122/suspend.d/60-generate-modules-list.sh 1969-12-31 19:00:00.000000000 -0500 @@ -1,30 +0,0 @@ -#!/bin/sh - -for x in /sys/module/*_ircc /sys/module/*_ircc2; do - x=`basename $x` - # nsc_ircc is safe over suspend/resume - if [ $x != "nsc_ircc" ]; then - modprobe -r $x 2>/dev/null; - # These don't get added to the reload list, since irda startup will - # do that - fi -done - -if [ -d /sys/module/ndiswrapper ]; then - modprobe -r ndiswrapper - MODULES="$MODULES ndiswrapper" -fi - -# This is not guaranteed to work - several drivers appear to use names that -# are not the same as their module name -for x in /sys/class/net/*; do - if [ -e $x/device/driver ] - then - MODULES="$MODULES $(basename $(readlink $x/device/driver) | tr [:upper:\] [:lower:])" - fi -done - -if [ -d /sys/module/netconsole ]; then - rmmod netconsole - MODULES="$MODULES netconsole" -fi diff -Nru acpi-support-0.121/suspend.d/65-services-stop.sh acpi-support-0.122/suspend.d/65-services-stop.sh --- acpi-support-0.121/suspend.d/65-services-stop.sh 2009-03-25 15:49:19.000000000 -0400 +++ acpi-support-0.122/suspend.d/65-services-stop.sh 1969-12-31 19:00:00.000000000 -0500 @@ -1,7 +0,0 @@ -#!/bin/sh - -# Shut down services known to misbehave -for x in $STOP_SERVICES; do - invoke-rc.d --quiet $x stop -done - diff -Nru acpi-support-0.121/suspend.d/70-modules-unload.sh acpi-support-0.122/suspend.d/70-modules-unload.sh --- acpi-support-0.121/suspend.d/70-modules-unload.sh 2009-03-25 15:49:19.000000000 -0400 +++ acpi-support-0.122/suspend.d/70-modules-unload.sh 1969-12-31 19:00:00.000000000 -0500 @@ -1,12 +0,0 @@ -#!/bin/sh - -# Some modules survive better if they're left loaded -for x in $MODULES_WHITELIST; do - MODULES=`echo $MODULES | sed s/$x//g`; -done - -# Now remove various modules that might misbehave while suspending -for x in $MODULES; do - modprobe -r $x 2>/dev/null; -done - diff -Nru acpi-support-0.121/suspend.d/75-console-switch.sh acpi-support-0.122/suspend.d/75-console-switch.sh --- acpi-support-0.121/suspend.d/75-console-switch.sh 2009-03-25 15:49:19.000000000 -0400 +++ acpi-support-0.122/suspend.d/75-console-switch.sh 1969-12-31 19:00:00.000000000 -0500 @@ -1,8 +0,0 @@ -#!/bin/sh - -# And remember which console we're on -CONSOLE=`fgconsole` - -# Change away from X, otherwise it'll blow up when we POST the video interface -chvt 12 - diff -Nru acpi-support-0.121/suspend.d/85-alsa-state.sh acpi-support-0.122/suspend.d/85-alsa-state.sh --- acpi-support-0.121/suspend.d/85-alsa-state.sh 2009-03-25 15:49:19.000000000 -0400 +++ acpi-support-0.122/suspend.d/85-alsa-state.sh 1969-12-31 19:00:00.000000000 -0500 @@ -1,7 +0,0 @@ -#!/bin/sh - -# Save the ALSA state -if [ -x /etc/init.d/alsa-utils ]; then - /etc/init.d/alsa-utils stop -fi - diff -Nru acpi-support-0.121/suspend.d/90-framebuffer-stop.sh acpi-support-0.122/suspend.d/90-framebuffer-stop.sh --- acpi-support-0.121/suspend.d/90-framebuffer-stop.sh 2009-03-25 15:49:19.000000000 -0400 +++ acpi-support-0.122/suspend.d/90-framebuffer-stop.sh 1969-12-31 19:00:00.000000000 -0500 @@ -1,14 +0,0 @@ -#!/bin/sh - -# Make sure the backlight goes off -if [ x$USE_DPMS = "xtrue" ]; then - vbetool dpms off -fi - -# SHUT UP FRAMEBUFFER -for x in /sys/class/graphics/*; do - if [ -f $x/state ]; then - echo -n 1 >$x/state; - fi -done -