Oops, forgot up update Makefile.am

2 files changed, 27 insertions, 45 deletions

diff --git a/pm/sleep.d/98-video-quirk-db-handler b/pm/sleep.d/98-video-quirk-db-handler
index a13a537..dc66406 100755
--- a/pm/sleep.d/98-video-quirk-db-handler
+++ b/pm/sleep.d/98-video-quirk-db-handler
@@ -14,32 +14,32 @@ shopt -s extglob
     set -x
 }
 
-QUIRKS=""
-
-# Some quirklist manipulation functions
-
-has_quirk() {
-    local quirk
-    for quirk in $QUIRKS; do
-	[[ $quirk = $1 ]] && return 0
+possible_video_parameters=" --quirk-dpms-on
+	   --quirk-dpms-suspend
+	   --quirk-s3-mode
+	   --quirk-s3-bios
+	   --quirk-vbe-post
+	   --quirk-vbe-post
+	   --quirk-vga-mode3
+	   --quirk-vbemode-restore
+	   --quirk-vbestate-restore
+	   --quirk-reset-brightness
+	   --quirk-radeon-off
+	   --quirk-no-fb
+	   --quirk-pci-save"
+
+]video_parameters() {
+
+
+has_video_parameters() {
+    local p params=$(get_parameters)
+    [[ $params ]] || return 1
+    for p in $params; do
+	[[ $possible_video_parameters = *$p* ]] && return
     done
     return 1
 }
 
-remove_quirk() {
-    local new_quirks quirk
-    local new_quirks=""
-    for quirk in $QUIRKS; do
-	[[ $quirk = $1 ]] || new_quirks="$quirk $new_quirks"
-    done
-    QUIRKS="$new_quirks"
-}
-
-add_quirk() {
-    has_quirk "$1" && return
-    QUIRKS="$QUIRKS $1"
-}
-
 # video specific helper functions.
 
 # Are we using the nVidia binary driver?
@@ -294,18 +294,14 @@ _find_native() {
 		fi
 		;;
 	    endmatch)
-		[[ $found ]] && {
-		    echo $QUIRKS; return 0
-		} 
-		return 1
-		;;
+		[[ $found ]] && return 0 || return 1 ;;
 	    addquirk) [[ $1 = ignore ]] && continue
 		found=true
-		add_quirk "$key"
+		add_parameters "$key"
 		;;
 	    delquirk) [[ $1 = ignore ]]&& continue
 		found=true
-		remove_quirk "$key"
+		remove_parameters "$key"
 		;;
 	esac
     done
@@ -383,7 +379,6 @@ case $1 in
        else
        # Go ahead and get our quirks -- we will handle non-KMS Intel drivers
        # later.
-	   maybe_update_native
 	   if ! find_native "$PM_QUIRKDB/last_known_working.quirkdb" >/dev/null; then
 	       rm "$PM_QUIRKDB/last_known_working.quirkdb" >/dev/null 2>&1
 	       for f in "$PM_QUIRKDB"/*
@@ -411,19 +406,7 @@ case $1 in
 	   fi
        fi
        [[ $QUIRKS ]] || $QUIRKS="--quirk-none"
-       remove_parameters --quirk-dpms-on \
-	   --quirk-dpms-suspend \
-	   --quirk-s3-mode \
-	   --quirk-s3-bios \
-	   --quirk-vbe-post \
-	   --quirk-vbe-post \
-	   --quirk-vga-mode3 \
-	   --quirk-vbemode-restore \
-	   --quirk-vbestate-restore \
-	   --quirk-reset-brightness \
-	   --quirk-radeon-off \
-	   --quirk-no-fb \
-	   --quirk-pci-save
+       remove_parameters
        add_parameters $QUIRKS
        savestate video_quirks "$QUIRKS"
        ;;
diff --git a/pm/sleep.d/Makefile.am b/pm/sleep.d/Makefile.am
index b367a17..03e17a5 100644
--- a/pm/sleep.d/Makefile.am
+++ b/pm/sleep.d/Makefile.am
@@ -1,7 +1,6 @@
 sleepdir = $(libdir)/pm-utils/sleep.d
 
 sleep_SCRIPTS =			\
-	00auto-quirk 		\
 	00logging		\
 	00powersave		\
 	01grub			\
@@ -11,7 +10,7 @@ sleep_SCRIPTS =			\
 	90clock			\
 	94cpufreq		\
 	95led			\
-	98smart-kernel-video 	\
+	98-video-quirk-db-handler \
 	99video
 
 EXTRA_DIST=$(sleep_SCRIPTS)