pm-utils: add patches missed in previous.
This commit is contained in:
parent
670dc453e2
commit
bba89abdb9
|
@ -0,0 +1,19 @@
|
|||
Author: James Westby <james.westby@ubuntu.com>
|
||||
Description: Do not clear the log file on each operation, but instead append to it.
|
||||
This makes debugging of several suspends much easier.
|
||||
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=25255
|
||||
Bug-Ubuntu: https://launchpad.net/bugs/410352
|
||||
|
||||
Index: pm-utils/pm/pm-functions.in
|
||||
===================================================================
|
||||
--- pm-utils.orig/pm/pm-functions.in 2010-07-05 18:41:21.118322244 +0200
|
||||
+++ pm-utils/pm/pm-functions.in 2010-07-05 18:41:24.126325221 +0200
|
||||
@@ -271,7 +271,7 @@
|
||||
return 1
|
||||
fi
|
||||
export LOGGING=true
|
||||
- exec > "$1" 2>&1
|
||||
+ exec >> "$1" 2>&1
|
||||
}
|
||||
|
||||
check_suspend() { [ -n "$SUSPEND_MODULE" ]; }
|
|
@ -0,0 +1,40 @@
|
|||
From: Florian Kriener <florian@kriener.org>
|
||||
To: submit@bugs.debian.org
|
||||
Subject: [pm-utils] wrong path in intel-audio-powersave (and a small bug)
|
||||
Date: Sat, 25 Sep 2010 11:27:30 +0200
|
||||
|
||||
In the script intel-audio-powersave is this loop
|
||||
|
||||
for dev in /sys/module/snd_*/parameters/power_save; do
|
||||
[ -w "$dev/parameters/power_save" ] || continue
|
||||
printf "Setting power savings for $s to %d..." "$dev##*/" "$1"
|
||||
echo $1 > "$dev/parameters/power_save" && echo Done. || echo Failed.
|
||||
done
|
||||
|
||||
I think it should be
|
||||
|
||||
for dev in /sys/module/snd_*; do
|
||||
[ -w "$dev/parameters/power_save" ] || continue
|
||||
printf "Setting power savings for %s to %d..." "${dev##*/}" "$1"
|
||||
echo $1 > "$dev/parameters/power_save" && echo Done. || echo Failed.
|
||||
done
|
||||
|
||||
|
||||
This fixes the two bugs.
|
||||
|
||||
diff --git a/pm/power.d/intel-audio-powersave b/pm/power.d/intel-audio-powersave
|
||||
index 36675a8..da63e40 100644
|
||||
--- a/pm/power.d/intel-audio-powersave
|
||||
+++ b/pm/power.d/intel-audio-powersave
|
||||
@@ -20,9 +20,9 @@ EOF
|
||||
|
||||
audio_powersave() {
|
||||
[ "$INTEL_AUDIO_POWERSAVE" = "true" ] || exit $NA
|
||||
- for dev in /sys/module/snd_*/parameters/power_save; do
|
||||
+ for dev in /sys/module/snd_*; do
|
||||
[ -w "$dev/parameters/power_save" ] || continue
|
||||
- printf "Setting power savings for $s to %d..." "$dev##*/" "$1"
|
||||
+ printf "Setting power savings for %s to %d..." "${dev##*/}" "$1"
|
||||
echo $1 > "$dev/parameters/power_save" && echo Done. || echo Failed.
|
||||
done
|
||||
}
|
|
@ -0,0 +1,43 @@
|
|||
From 640b53438c20818b3e344343b58b1f1765606a85 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Pitt <martin.pitt@ubuntu.com>
|
||||
Date: Mon, 31 Jan 2011 15:30:01 +0100
|
||||
Subject: [PATCH] 49bluetooth: Wait for btusb module to get unused
|
||||
|
||||
The 49bluetooth hook disables /proc/acpi/ibm/bluetooth but this isn't
|
||||
synchronous, i. e. it doesn't wait until the module usage count actually drops
|
||||
to 0. Due to that, it's impossible to add btusb to SUSPEND_MODULES (on some
|
||||
models/older kernels you need to do that to fix suspend problems), as at that
|
||||
point the module is still in use.
|
||||
|
||||
On my system (ThinkPad X201) the module takes between 0.3 and 0.5 seconds to
|
||||
unload, so use 100 ms wait steps with a timeout of 2 seconds.
|
||||
|
||||
Bug: https://bugs.freedesktop.org//show_bug.cgi?id=33759
|
||||
Bug-Ubuntu: https://launchpad.net/bugs/698331
|
||||
---
|
||||
pm/sleep.d/49bluetooth | 9 +++++++++
|
||||
1 files changed, 9 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/pm/sleep.d/49bluetooth b/pm/sleep.d/49bluetooth
|
||||
index d46ba49..0dc1909 100755
|
||||
--- a/pm/sleep.d/49bluetooth
|
||||
+++ b/pm/sleep.d/49bluetooth
|
||||
@@ -12,6 +12,15 @@ suspend_bluetooth()
|
||||
if grep -q enabled /proc/acpi/ibm/bluetooth; then
|
||||
savestate ibm_bluetooth enable
|
||||
echo disable > /proc/acpi/ibm/bluetooth
|
||||
+
|
||||
+ # wait for up to 2 seconds for the module to actually get
|
||||
+ # unused
|
||||
+ TIMEOUT=20
|
||||
+ while [ $TIMEOUT -ge 0 ]; do
|
||||
+ [ `cat /sys/module/btusb/refcnt` = 0 ] && break
|
||||
+ TIMEOUT=$((TIMEOUT-1))
|
||||
+ sleep 0.1
|
||||
+ done
|
||||
else
|
||||
savestate ibm_bluetooth disable
|
||||
fi
|
||||
--
|
||||
1.7.2.3
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
Description: Disable SATA link power management by default, as it still causes disk errors and corruptions on many hardware.
|
||||
Author: Martin Pitt <martin.pitt@ubuntu.com>
|
||||
Bug-Ubuntu: https://launchpad.net/bugs/539467
|
||||
|
||||
Index: pm-utils/pm/power.d/sata_alpm
|
||||
===================================================================
|
||||
--- pm-utils.orig/pm/power.d/sata_alpm 2011-02-01 15:53:09.164867778 +0100
|
||||
+++ pm-utils/pm/power.d/sata_alpm 2011-02-01 15:53:28.954867786 +0100
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
. "${PM_FUNCTIONS}"
|
||||
|
||||
-SATA_ALPM_ENABLE=${SATA_ALPM_ENABLE:-true}
|
||||
+SATA_ALPM_ENABLE=${SATA_ALPM_ENABLE:-false}
|
||||
|
||||
help() {
|
||||
cat <<EOF
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
This hook has 1 parameter:
|
||||
SATA_ALPM_ENABLE = whether to use SATA ALPM on battery.
|
||||
-Defaults to "true".
|
||||
+Defaults to "false".
|
||||
|
||||
EOF
|
||||
}
|
Loading…
Reference in New Issue