summaryrefslogtreecommitdiff
path: root/pm
diff options
context:
space:
mode:
Diffstat (limited to 'pm')
-rwxr-xr-xpm/sleep.d/00auto-quirk3
-rwxr-xr-xpm/sleep.d/99video2
2 files changed, 4 insertions, 1 deletions
diff --git a/pm/sleep.d/00auto-quirk b/pm/sleep.d/00auto-quirk
index 0f9bcce..e45686e 100755
--- a/pm/sleep.d/00auto-quirk
+++ b/pm/sleep.d/00auto-quirk
@@ -6,7 +6,7 @@ do_add_quirks()
{
add_parameters $(lshal | \
awk -F '[. ]' \
- '/ power_management.quirk.[a-z_]+ = true/ \
+ '/ power_management.quirk.[0-9a-z_]+ = true/ \
{gsub(/_/, "-", $5); printf("--quirk-%s", $5)}')
}
@@ -64,6 +64,7 @@ maybe_add_quirks()
maybe_save_quirks()
{
+ inhibited && return 0
has_parameter --store-quirks-as-fdi && do_save_quirks
return 0
}
diff --git a/pm/sleep.d/99video b/pm/sleep.d/99video
index dc8590a..0beb360 100755
--- a/pm/sleep.d/99video
+++ b/pm/sleep.d/99video
@@ -166,6 +166,8 @@ resume_video()
quirk "${QUIRK_RADEON_OFF}" && radeon_on
quirk "${QUIRK_DPMS_ON}" && vbe dpms on
quirk "${QUIRK_RESET_BRIGHTNESS}" && reset_brightness
+ # always reset acpi_video_flag -- makes quirk testing more reliable.
+ sysctl -w kernel.acpi_video_flags=0
return 0 # avoid spurious hook exit failure message.
}