From d16f3e4c39708ca0e3380b3458512409546d2568 Mon Sep 17 00:00:00 2001 From: Thomas Bächler Date: Sat, 22 Mar 2008 16:46:54 +0100 Subject: Change resume hook to work with tuxonice --- hooks/resume | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/hooks/resume b/hooks/resume index f410051..e4df259 100644 --- a/hooks/resume +++ b/hooks/resume @@ -1,23 +1,18 @@ # vim:set ft=sh: -# TODO encrypted swap partition if resume2 begins with 'swap:' run_hook () { fmtdevice () { echo "${1}:${2}"; } - # Try resuming with swsusp - if [ -e "/sys/power/resume" -a -e "${resume}" ]; then - dev_t=$( /bin/parseblock "${resume}" ) - fmtdevice ${dev_t} > /sys/power/resume + # Try resuming with tuxonice + tuxoniceroot="/sys/power/tuxonice" + if [ -d "${tuxoniceroot}" -a -n "${resume}" ]; then + echo ${resume} > ${tuxoniceroot}/resume + echo > ${tuxoniceroot}/do_resume fi - # Try resuming with suspend2 - if [ -d "/sys/power/suspend2" ]; then - suspend2root="/sys/power/suspend2" - else - suspend2root="/proc/suspend2" - fi - if [ -d "${suspend2root}" -a -n "${resume2}" ]; then - echo ${resume2} > ${suspend2root}/resume2 - echo > ${suspend2root}/do_resume + # Try resuming with vanilla hibernation + if [ -e "/sys/power/resume" -a -n "${resume}" ]; then + eval $(/bin/parseblock "${resume}") + fmtdevice ${BLOCKDEVICE} > /sys/power/resume fi } -- cgit v1.2.3-24-g4f1b