diff options
author | Victor Lowther <victor.lowther@gmail.com> | 2009-11-07 23:26:39 -0600 |
---|---|---|
committer | Victor Lowther <victor.lowther@gmail.com> | 2009-11-07 23:26:39 -0600 |
commit | 6014e54b7f007109616965ff601ff05ea6fc397a (patch) | |
tree | 50fc73bc32b4ee91bb7cdc9d3cc003bf46a65d5f /pm | |
parent | 504faf0a0c31cbdbc03a608cf633d58f12e49eb7 (diff) | |
parent | 6691c51d58951c328e08e50087b354ceb2c4f3db (diff) |
Merge commit 'remotes/UPSTREAM/master'
Diffstat (limited to 'pm')
-rw-r--r-- | pm/HOWTO.hooks | 2 | ||||
-rwxr-xr-x | pm/sleep.d/90clock | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/pm/HOWTO.hooks b/pm/HOWTO.hooks index a506759..ad7d4a7 100644 --- a/pm/HOWTO.hooks +++ b/pm/HOWTO.hooks @@ -43,7 +43,7 @@ In normal operation, hooks should only return either 0 or 254 as exit codes. Any other return code is interpreted by the pm-utils machinery as a signal from the hook that it should abort whatever it is doing. When running sleep.d hooks, that means that pm-utils stops running hooks, aborts the suspend/resume -process, calls any hooks that ran sucessfully prior to this one with the +process, calls any hooks that ran successfully prior to this one with the appropriate wakeup options, and exits with a non-zero exit code. When running power.d hooks, any hooks after this one will be skipped. diff --git a/pm/sleep.d/90clock b/pm/sleep.d/90clock index fb8ef44..b8ade29 100755 --- a/pm/sleep.d/90clock +++ b/pm/sleep.d/90clock @@ -1,7 +1,6 @@ #!/bin/sh # Synchronize system time with hardware time. -# TODO: Do modern kernels handle this correctly? If so, we should detect that -# and skip this hook. +# Modern kernels handle this correctly so we skip this hook by default. . "${PM_FUNCTIONS}" |