summaryrefslogtreecommitdiff
path: root/pm
diff options
context:
space:
mode:
authorVictor Lowther <victor.lowther@gmail.com>2009-12-10 22:37:05 -0600
committerVictor Lowther <victor.lowther@gmail.com>2009-12-10 22:37:05 -0600
commit03b34a925efebf3cc98939cfbb8e58a4408b5f93 (patch)
treefa3108e3c0c694aa6985a892a56a41b27dbf5e21 /pm
parentd1ebbc409abd43c1b8a96640516aff48f2492027 (diff)
parent2c7982708aea4296cdd238b224fc9b0b99f117b8 (diff)
Merge branch 'pm-utils-1.2' into pm-utils-1.3
Conflicts: pm/sleep.d/98smart-kernel-video
Diffstat (limited to 'pm')
-rw-r--r--pm/functions.in2
-rwxr-xr-xpm/module.d/uswsusp2
-rwxr-xr-xpm/sleep.d/99video10
3 files changed, 7 insertions, 7 deletions
diff --git a/pm/functions.in b/pm/functions.in
index 0aba5ea..4fb9d1f 100644
--- a/pm/functions.in
+++ b/pm/functions.in
@@ -8,7 +8,7 @@
is_set()
{
case ${1-UNSET} in
- true|yes|TRUE|YES|on|ON|1'') return 0;;
+ true|yes|TRUE|YES|on|ON|1|'') return 0;;
false|FALSE|no|NO|off|OFF|0|UNSET) return 1;;
*) return 2;;
esac
diff --git a/pm/module.d/uswsusp b/pm/module.d/uswsusp
index 53f304e..264db25 100755
--- a/pm/module.d/uswsusp
+++ b/pm/module.d/uswsusp
@@ -25,7 +25,7 @@ uswsusp_get_quirks()
vbe-post) OPTS="$OPTS --vbe_post" ;;
vbemode-restore) OPTS="$OPTS --vbe_mode" ;;
vbestate-restore) OPTS="$OPTS --vbe_save" ;;
- vga-mode3) ;; # no-op
+ vga-mode-3) ;; # no-op
save-pci) OPTS="$OPTS --pci_save" ;;
none) QUIRK_NONE="true" ;;
*) continue ;;
diff --git a/pm/sleep.d/99video b/pm/sleep.d/99video
index 29f2f2c..452a88a 100755
--- a/pm/sleep.d/99video
+++ b/pm/sleep.d/99video
@@ -25,9 +25,9 @@ for opt in $PM_CMDLINE; do
vbe-post) QUIRK_VBE_POST="true" ;;
vbemode-restore) QUIRK_VBEMODE_RESTORE="true" ;;
vbestate-restore) QUIRK_VBESTATE_RESTORE="true" ;;
- vga-mode3) QUIRK_VGA_MODE_3="true" ;;
+ vga-mode-3) QUIRK_VGA_MODE_3="true" ;;
no-fb) QUIRK_NOFB="true" ;;
- pci-save) QUIRK_PCI_SAVE="true" ;;
+ save-pci) QUIRK_SAVE_PCI="true" ;;
no-chvt) QUIRK_NO_CHVT="true" ;;
none) QUIRK_NONE="true" ;;
*) continue ;;
@@ -165,7 +165,7 @@ suspend_video()
quirk "${QUIRK_VBESTATE_RESTORE}" && vbe_savestate
quirk "${QUIRK_VBEMODE_RESTORE}" && vbe_savemode
quirk "${QUIRK_RADEON_OFF}" && radeon_off
- quirk "${QUIRK_PCI_SAVE}" && pci_save
+ quirk "${QUIRK_SAVE_PCI}" && save_pci
quirk "${QUIRK_VGA_MODE_3}" && vbe vbemode set 3
quirk "${QUIRK_DPMS_SUSPEND}" && vbe dpms suspend
save_fbcon
@@ -173,7 +173,7 @@ suspend_video()
resume_video()
{
# We might need to do one or many of these quirks
- quirk "${QUIRK_PCI_SAVE}" && pci_restore
+ quirk "${QUIRK_SAVE_PCI}" && restore_pci
quirk "${QUIRK_VBE_POST}" && vbe_post
quirk "${QUIRK_VBESTATE_RESTORE}" && vbe_restorestate
quirk "${QUIRK_VBEMODE_RESTORE}" && vbe_restoremode
@@ -197,7 +197,7 @@ help() {
echo " --quirk-vbe-post"
echo " --quirk-vbemode-restore"
echo " --quirk-vbestate-restore"
- echo " --quirk-vga-mode3"
+ echo " --quirk-vga-mode-3"
echo " --quirk-none"
}