diff options
author | Victor Lowther <victor.lowther@gmail.com> | 2008-02-05 16:09:04 -0600 |
---|---|---|
committer | Victor Lowther <victor.lowther@gmail.com> | 2008-02-07 17:26:50 -0600 |
commit | 558c2fbfb3157a0d18d66dd8b6b34a2c24c61164 (patch) | |
tree | f7a7d8007c38c6d2b501d4898e6587da63eeda8c /pm/sleep.d | |
parent | 8df496aeffe3a7114fa01912d7605693c5bc64b9 (diff) |
Simplify hook implementation.
modified: pm/HOWTO.hooks
modified: pm/functions.in
modified: pm/sleep.d/Makefile.am
deleted: pm/sleep.d/zzz
* Merge the functionality of find_hooks and run_hooks. This results in
a new run_hooks function which is much simpler than the old one and is
much more resistant to breaking due to odd filenames.
* Actually implements the functionality mentioned in README where you
can create a nonexecutable file in /etc/pm/(sleep|power).d that will
prevent the copy in /usr/lib/pm-utils/(sleep|power).d from running.
* Undoes the "nonzero exit code means do not run on resume" and
auto-reverse pseudofeatures I added in the POSIX series. If anyone likes
them, they can be added back at the cost of either passing a function to
run_hooks or maintaining a global variable.
* Merges the functionality that was in zzz back into pm_main. Although
zzz was a slightly funny name, upon further reflection it was a bad idea
and makes it harder to implement some partitioning of functionality that
will be needed if/when the hooks are split into their own project.
* Updates the documentation to reflect these changes.
Diffstat (limited to 'pm/sleep.d')
-rw-r--r-- | pm/sleep.d/Makefile.am | 3 | ||||
-rwxr-xr-x | pm/sleep.d/zzz | 10 |
2 files changed, 1 insertions, 12 deletions
diff --git a/pm/sleep.d/Makefile.am b/pm/sleep.d/Makefile.am index 5092a42..256ee0b 100644 --- a/pm/sleep.d/Makefile.am +++ b/pm/sleep.d/Makefile.am @@ -13,8 +13,7 @@ sleep_SCRIPTS = \ 90clock \ 94cpufreq \ 95led \ - 99video \ - zzz + 99video EXTRA_DIST=$(sleep_SCRIPTS) diff --git a/pm/sleep.d/zzz b/pm/sleep.d/zzz deleted file mode 100755 index 202e3a0..0000000 --- a/pm/sleep.d/zzz +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -. "${PM_FUNCTIONS}" -[ -e "${INHIBIT}" ] && return 1 -sync;sync;sync; -case $1 in - suspend|hibernate|suspend_hybrid) "do_$1" ;; - resume|thaw) exit 0 ;; - *) exit 1 ;; -esac -exit $? |