diff options
Diffstat (limited to 'sys-power/acpi-support/files/acpi-support-0.95-gentoo.patch')
| -rw-r--r-- | sys-power/acpi-support/files/acpi-support-0.95-gentoo.patch | 68 |
1 files changed, 66 insertions, 2 deletions
diff --git a/sys-power/acpi-support/files/acpi-support-0.95-gentoo.patch b/sys-power/acpi-support/files/acpi-support-0.95-gentoo.patch index 2e7af8b70..3ab6d1065 100644 --- a/sys-power/acpi-support/files/acpi-support-0.95-gentoo.patch +++ b/sys-power/acpi-support/files/acpi-support-0.95-gentoo.patch @@ -1,7 +1,7 @@ diff -ur orig/acpi-support-0.94/acpi-support work/acpi-support-0.94/acpi-support --- orig/acpi-support-0.94/acpi-support 2006-09-15 12:47:55.000000000 -0400 -+++ work/acpi-support-0.94/acpi-support 2007-04-12 20:00:17.000000000 -0400 -@@ -67,3 +67,7 @@ ++++ work/acpi-support-0.94/acpi-support 2007-04-13 20:31:15.000000000 -0400 +@@ -67,3 +67,11 @@ # Switch to laptop-mode on battery power - off by default as it causes odd # hangs on some machines ENABLE_LAPTOP_MODE=false @@ -9,6 +9,10 @@ diff -ur orig/acpi-support-0.94/acpi-support work/acpi-support-0.94/acpi-support +# Disable wake-on-LAN for wired Ethernet devices. WOL is on by default on some +# laptops. Disabling it can save power during sleep. (Requires ethtool) +DISABLE_WOL=false ++ ++# Use hibernate-script to handle hibernation and sleep. Hibernate-script uses ++# configuration files in /etc/hibernate and does not use the options above. ++# USE_HIBERNATE_SCRIPT=true diff -ur orig/acpi-support-0.94/debian/init.d work/acpi-support-0.94/debian/init.d --- orig/acpi-support-0.94/debian/init.d 2006-03-28 11:26:44.000000000 -0500 +++ work/acpi-support-0.94/debian/init.d 2007-04-12 10:24:25.000000000 -0400 @@ -83,6 +87,8 @@ diff -ur orig/acpi-support-0.94/debian/init.d work/acpi-support-0.94/debian/init + fi + eend 0 +} +Only in work/acpi-support-0.94/events: ibm-ultrabay-eject +Only in work/acpi-support-0.94/events: ibm-ultrabay-insert diff -ur orig/acpi-support-0.94/hibernatebtn.sh work/acpi-support-0.94/hibernatebtn.sh --- orig/acpi-support-0.94/hibernatebtn.sh 2006-02-06 09:54:47.000000000 -0500 +++ work/acpi-support-0.94/hibernatebtn.sh 2007-04-12 10:25:25.000000000 -0400 @@ -92,6 +98,21 @@ diff -ur orig/acpi-support-0.94/hibernatebtn.sh work/acpi-support-0.94/hibernate -acpi_fakekey $KEY_SUSPEND + +. /etc/acpi/hibernate.sh +diff -ur orig/acpi-support-0.94/hibernate.sh work/acpi-support-0.94/hibernate.sh +--- orig/acpi-support-0.94/hibernate.sh 2006-09-15 16:43:46.000000000 -0400 ++++ work/acpi-support-0.94/hibernate.sh 2007-04-13 20:22:19.000000000 -0400 +@@ -8,6 +8,11 @@ + exit; + fi + ++if [[ $USE_HIBERNATE_SCRIPT == true ]] && [[ -x /usr/sbin/hibernate ]] ; then ++ /usr/sbin/hibernate ++ exit ++fi ++ + # Unset video posting - it's not needed for suspend to disk + unset POST_VIDEO + unset USE_DPMS diff -ur orig/acpi-support-0.94/lib/policy-funcs work/acpi-support-0.94/lib/policy-funcs --- orig/acpi-support-0.94/lib/policy-funcs 2006-05-19 16:21:58.000000000 -0400 +++ work/acpi-support-0.94/lib/policy-funcs 2007-04-12 10:27:15.000000000 -0400 @@ -163,6 +184,19 @@ diff -ur orig/acpi-support-0.94/resume.d/62-ifup.sh work/acpi-support-0.94/resum + /etc/init.d/net.$x start & done +diff -ur orig/acpi-support-0.94/resume.d/67-sound.sh work/acpi-support-0.94/resume.d/67-sound.sh +--- orig/acpi-support-0.94/resume.d/67-sound.sh 2006-04-21 10:19:38.000000000 -0400 ++++ work/acpi-support-0.94/resume.d/67-sound.sh 2007-04-13 13:27:05.000000000 -0400 +@@ -1,7 +1,7 @@ + #!/bin/sh + + # Get sound back +-if [ -x /etc/init.d/alsa-utils ]; then +- /etc/init.d/alsa-utils start ++if [ -x /etc/init.d/alsasound ]; then ++ /etc/init.d/alsasound start + fi + diff -ur orig/acpi-support-0.94/sleepbtn.sh work/acpi-support-0.94/sleepbtn.sh --- orig/acpi-support-0.94/sleepbtn.sh 2006-02-06 09:55:00.000000000 -0500 +++ work/acpi-support-0.94/sleepbtn.sh 2007-04-12 10:29:48.000000000 -0400 @@ -172,6 +206,21 @@ diff -ur orig/acpi-support-0.94/sleepbtn.sh work/acpi-support-0.94/sleepbtn.sh -acpi_fakekey $KEY_SLEEP + +. /etc/acpi/sleep.sh +diff -ur orig/acpi-support-0.94/sleep.sh work/acpi-support-0.94/sleep.sh +--- orig/acpi-support-0.94/sleep.sh 2006-05-19 15:37:32.000000000 -0400 ++++ work/acpi-support-0.94/sleep.sh 2007-04-13 20:23:41.000000000 -0400 +@@ -16,6 +16,11 @@ + exit; + fi + ++if [[ $USE_HIBERNATE_SCRIPT == true ]] && [[ -x /usr/sbin/hibernate ]] ; then ++ /usr/sbin/hibernate --config-file=/etc/hibernate/ram.conf ++ exit; ++fi ++ + if [ x$LOCK_SCREEN = xtrue ]; then + if pidof xscreensaver > /dev/null; then + for x in /tmp/.X11-unix/*; do diff -ur orig/acpi-support-0.94/suspend.d/50-irda-stop.sh work/acpi-support-0.94/suspend.d/50-irda-stop.sh --- orig/acpi-support-0.94/suspend.d/50-irda-stop.sh 2006-04-21 11:05:47.000000000 -0400 +++ work/acpi-support-0.94/suspend.d/50-irda-stop.sh 2007-04-12 10:30:31.000000000 -0400 @@ -197,6 +246,21 @@ diff -ur orig/acpi-support-0.94/suspend.d/55-down-interfaces.sh work/acpi-suppor ifconfig $x down; done +diff -ur orig/acpi-support-0.94/suspend.d/85-alsa-state.sh work/acpi-support-0.94/suspend.d/85-alsa-state.sh +--- orig/acpi-support-0.94/suspend.d/85-alsa-state.sh 2006-04-21 11:00:08.000000000 -0400 ++++ work/acpi-support-0.94/suspend.d/85-alsa-state.sh 2007-04-13 13:27:14.000000000 -0400 +@@ -1,7 +1,7 @@ + #!/bin/sh + + # Save the ALSA state +-if [ -x /etc/init.d/alsa-utils ]; then +- /etc/init.d/alsa-utils stop ++if [ -x /etc/init.d/alsasound ]; then ++ /etc/init.d/alsasound stop + fi + +Only in work/acpi-support-0.94: thinkpad-ultrabay-eject.sh +Only in work/acpi-support-0.94: thinkpad-ultrabay-insert.sh diff -ur orig/acpi-support-0.94/vbesave work/acpi-support-0.94/vbesave --- orig/acpi-support-0.94/vbesave 2006-05-03 16:31:51.000000000 -0400 +++ work/acpi-support-0.94/vbesave 2007-04-12 10:31:29.000000000 -0400 |