From fe2ca57793f5f8461084d69e69939d8e0bb42b2b Mon Sep 17 00:00:00 2001
From: Thomas Bächler <thomas@archlinux.org>
Date: Sat, 6 Jun 2009 23:44:09 +0200
Subject: Use poll_device before resuming, continue if the device doesn't exist

---
 hooks/resume | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'hooks')

diff --git a/hooks/resume b/hooks/resume
index e4df259..5e4d51b 100644
--- a/hooks/resume
+++ b/hooks/resume
@@ -3,16 +3,18 @@ run_hook ()
 {
     fmtdevice () { echo "${1}:${2}"; }
 
-    # Try resuming with tuxonice
-    tuxoniceroot="/sys/power/tuxonice"
-    if [ -d "${tuxoniceroot}" -a -n "${resume}" ]; then
-        echo ${resume} > ${tuxoniceroot}/resume
-        echo > ${tuxoniceroot}/do_resume
-    fi
+    if [ -n "${resume}" ] && poll_device "${resume}"; then
+        # Try resuming with tuxonice
+        tuxoniceroot="/sys/power/tuxonice"
+        if [ -d "${tuxoniceroot}" ]; then
+            echo ${resume} > ${tuxoniceroot}/resume
+            echo > ${tuxoniceroot}/do_resume
+        fi
 
-    # Try resuming with vanilla hibernation
-    if [ -e "/sys/power/resume" -a -n "${resume}" ]; then
-        eval $(/bin/parseblock "${resume}")
-        fmtdevice ${BLOCKDEVICE} > /sys/power/resume
+        # Try resuming with vanilla hibernation
+        if [ -e "/sys/power/resume" ]; then
+            eval $(/bin/parseblock "${resume}")
+            fmtdevice ${BLOCKDEVICE} > /sys/power/resume
+        fi
     fi
 }
-- 
cgit v1.2.3-24-g4f1b