diff options
| author | Victor Lowther <victor.lowther@gmail.com> | 2008-03-01 19:10:44 -0600 |
|---|---|---|
| committer | Victor Lowther <victor.lowther@gmail.com> | 2008-03-01 19:10:44 -0600 |
| commit | 053da7a5efd23b23527d073c0e63785211c4c954 (patch) | |
| tree | c40d1508c742dba8b73d168d8a9c652302bd892d /pm/sleep.d | |
| parent | 6d877fe5e1439496b20365e6877916ab3c7446f2 (diff) | |
| parent | 25b94082bc1588f5c9a2dc4be857531c774b8b2b (diff) | |
Merge branch 'vlowther-video-merge' into vlowther-hook-option-processing
Diffstat (limited to 'pm/sleep.d')
| -rwxr-xr-x | pm/sleep.d/00clear | 2 | ||||
| -rwxr-xr-x | pm/sleep.d/00logging | 2 | ||||
| -rw-r--r-- | pm/sleep.d/01grub | 2 | ||||
| -rwxr-xr-x | pm/sleep.d/05led | 2 | ||||
| -rwxr-xr-x | pm/sleep.d/10NetworkManager | 2 | ||||
| -rwxr-xr-x | pm/sleep.d/49bluetooth | 2 | ||||
| -rwxr-xr-x | pm/sleep.d/50modules | 2 | ||||
| -rwxr-xr-x | pm/sleep.d/65alsa | 2 | ||||
| -rwxr-xr-x | pm/sleep.d/90clock | 2 | ||||
| -rwxr-xr-x | pm/sleep.d/94cpufreq | 2 | ||||
| -rwxr-xr-x | pm/sleep.d/99video | 4 |
11 files changed, 12 insertions, 12 deletions
diff --git a/pm/sleep.d/00clear b/pm/sleep.d/00clear index 976fc21..6649199 100755 --- a/pm/sleep.d/00clear +++ b/pm/sleep.d/00clear @@ -3,7 +3,7 @@ . "${PM_FUNCTIONS}" case "$1" in - hibernate|suspend) + hibernate|suspend*) TERM=linux openvt -w -s -f -c 63 -- clear >/dev/null 2>&1 ;; *) diff --git a/pm/sleep.d/00logging b/pm/sleep.d/00logging index 7990a50..fd2a9a8 100755 --- a/pm/sleep.d/00logging +++ b/pm/sleep.d/00logging @@ -3,7 +3,7 @@ . "${PM_FUNCTIONS}" case "$1" in - hibernate|suspend) + hibernate|suspend*) [ -n "$PM_LOGFILE" ] || exit 0 /bin/uname -a lsmod diff --git a/pm/sleep.d/01grub b/pm/sleep.d/01grub index 7fa356a..61656a9 100644 --- a/pm/sleep.d/01grub +++ b/pm/sleep.d/01grub @@ -23,7 +23,7 @@ default_resume_kernel() } case "$1" in - hibernate) + hibernate|suspend_hybrid) default_resume_kernel ;; *) exit $NA diff --git a/pm/sleep.d/05led b/pm/sleep.d/05led index 84bef1b..c7263fd 100755 --- a/pm/sleep.d/05led +++ b/pm/sleep.d/05led @@ -3,7 +3,7 @@ [ -f /proc/acpi/ibm/led ] || exit $NA case "$1" in - hibernate|suspend) + hibernate|suspend*) echo "7 blink" >/proc/acpi/ibm/led ;; thaw|resume) diff --git a/pm/sleep.d/10NetworkManager b/pm/sleep.d/10NetworkManager index 8538d6b..bcb5e5d 100755 --- a/pm/sleep.d/10NetworkManager +++ b/pm/sleep.d/10NetworkManager @@ -23,7 +23,7 @@ resume_nm() } case "$1" in - hibernate|suspend) + hibernate|suspend*) suspend_nm ;; thaw|resume) diff --git a/pm/sleep.d/49bluetooth b/pm/sleep.d/49bluetooth index 5fcb04c..e4977c4 100755 --- a/pm/sleep.d/49bluetooth +++ b/pm/sleep.d/49bluetooth @@ -23,7 +23,7 @@ resume_bluetooth() } case "$1" in - hibernate|suspend) + hibernate|suspend*) suspend_bluetooth ;; thaw|resume) diff --git a/pm/sleep.d/50modules b/pm/sleep.d/50modules index 338529b..5d8c5da 100755 --- a/pm/sleep.d/50modules +++ b/pm/sleep.d/50modules @@ -17,7 +17,7 @@ resume_modules() } case "$1" in - hibernate|suspend) + hibernate|suspend*) suspend_modules ;; thaw|resume) diff --git a/pm/sleep.d/65alsa b/pm/sleep.d/65alsa index 5fc729e..bfe76be 100755 --- a/pm/sleep.d/65alsa +++ b/pm/sleep.d/65alsa @@ -5,7 +5,7 @@ command_exists alsactl || exit $NA case "$1" in - hibernate|suspend) + hibernate|suspend*) alsactl store 0 >/dev/null 2>&1 ;; thaw|resume) diff --git a/pm/sleep.d/90clock b/pm/sleep.d/90clock index f69c8c9..b000457 100755 --- a/pm/sleep.d/90clock +++ b/pm/sleep.d/90clock @@ -25,7 +25,7 @@ resume_clock() } case "$1" in - hibernate|suspend) + hibernate|suspend*) suspend_clock ;; thaw|resume) diff --git a/pm/sleep.d/94cpufreq b/pm/sleep.d/94cpufreq index 12dfc1f..1006180 100755 --- a/pm/sleep.d/94cpufreq +++ b/pm/sleep.d/94cpufreq @@ -28,7 +28,7 @@ thaw_cpufreq() } case "$1" in - suspend|hibernate) + suspend|hibernate*) hibernate_cpufreq ;; resume|thaw) diff --git a/pm/sleep.d/99video b/pm/sleep.d/99video index 74a3d34..de3d989 100755 --- a/pm/sleep.d/99video +++ b/pm/sleep.d/99video @@ -132,8 +132,8 @@ help() { } case "$1" in - suspend) suspend_video ;; - hibernate) + suspend*) suspend_video ;; + hibernate) if [ "$HIBERNATE_RESUME_POST_VIDEO" = "yes" ]; then suspend_video fi |