summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--man/pm-action.xml2
-rwxr-xr-xpm/sleep.d/98video-quirk-db-handler (renamed from pm/sleep.d/98-video-quirk-db-handler)7
-rw-r--r--pm/sleep.d/Makefile.am2
3 files changed, 7 insertions, 4 deletions
diff --git a/man/pm-action.xml b/man/pm-action.xml
index 405cb5f..08a7528 100644
--- a/man/pm-action.xml
+++ b/man/pm-action.xml
@@ -191,7 +191,7 @@
<para>
This option forces the video hardware to turn off the screen when suspending.
Most video adapters seem to do this correctly, but some do not, which
- wastes lits of power. If your screen is still on after successfully suspending
+ wastes lots of power. If your screen is still on after successfully suspending
you may need to use this option.
</para>
</listitem>
diff --git a/pm/sleep.d/98-video-quirk-db-handler b/pm/sleep.d/98video-quirk-db-handler
index d3bca3a..942a6a9 100755
--- a/pm/sleep.d/98-video-quirk-db-handler
+++ b/pm/sleep.d/98video-quirk-db-handler
@@ -160,7 +160,7 @@ halget() {
}
canonicalize_dmivar() {
- [[ $1 =~ ^[a-z.-]+$ && $possible_system_properties = *$1* ]] || return 1
+ [[ $1 =~ ^[a-z._-]+$ && $possible_system_properties = *$1* ]] || return 1
echo "${1//[-.]/_}"
}
@@ -204,7 +204,7 @@ isnum() {
# $2 = the given constant (or regular expression),
# $1 = the raw data grabbed from HAL or dmidecode or wherever
-regex() { [[ $1 =~ $2 ]]; }
+regex() { [[ $1 =~ ${2//;/|} ]]; }
regex_ncase() {
local r
@@ -300,6 +300,9 @@ find_native() (
[[ -f $1 ]] || return 1
exec <"$1"
_find_native work
+ res=$?
+ get_parameters
+ return $res
)
# If we resumed, write out the quirks we used as our last known
diff --git a/pm/sleep.d/Makefile.am b/pm/sleep.d/Makefile.am
index 03e17a5..2350825 100644
--- a/pm/sleep.d/Makefile.am
+++ b/pm/sleep.d/Makefile.am
@@ -10,7 +10,7 @@ sleep_SCRIPTS = \
90clock \
94cpufreq \
95led \
- 98-video-quirk-db-handler \
+ 98video-quirk-db-handler \
99video
EXTRA_DIST=$(sleep_SCRIPTS)