summaryrefslogtreecommitdiff
path: root/pm
diff options
context:
space:
mode:
authorVictor Lowther <victor.lowther@gmail.com>2010-03-14 21:41:53 -0500
committerVictor Lowther <victor.lowther@gmail.com>2010-03-14 21:41:53 -0500
commit8716abfa75f0e7d227fdba1d31cd65a7b9b9348c (patch)
treea478d86a4ed437daa8742c410246d6b9fbaa7326 /pm
parent509f6badd8ffcc40bd3393d8c222ee8adacfa6b6 (diff)
parent0fca81b9a39b31a8103f1380953948c722e2b331 (diff)
Merge branch 'master' into pm-utils-1.3
Diffstat (limited to 'pm')
-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
2 files changed, 6 insertions, 3 deletions
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)