From: Colin Guthrie <colin@mageia.org>
Date: Wed, 23 Jan 2013 20:15:03 +0000 (+0000)
Subject: resume: Ensure we remove the timout job when we find the resume device
X-Git-Tag: 026~62
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ed09d970ed4b893d9c1e9c684816b425cb9d7de;p=thirdparty%2Fdracut.git

resume: Ensure we remove the timout job when we find the resume device
---

diff --git a/modules.d/95resume/resume-genrules.sh b/modules.d/95resume/resume-genrules.sh
index f16df8cdf..c542c7151 100755
--- a/modules.d/95resume/resume-genrules.sh
+++ b/modules.d/95resume/resume-genrules.sh
@@ -32,8 +32,8 @@ if [ -n "$resume" ]; then
             ${resume#/dev/};
     } >> /etc/udev/rules.d/99-resume.rules
 
-    printf '[ -e "%s" ] && { ln -s "%s" /dev/resume; rm "$job"; udevadm settle; }\n' \
-        "$resume" "$resume" >> $hookdir/initqueue/settled/resume.sh
+    printf '[ -e "%s" ] && { ln -s "%s" /dev/resume; rm "$job" "%s/initqueue/timeout/resume.sh"; }\n' \
+        "$resume" "$resume" "$hookdir" >> $hookdir/initqueue/settled/resume.sh
 
     printf 'warn "Cancelling resume operation. Device not found."; cancel_wait_for_dev /dev/resume; rm "$job" "%s/initqueue/settled/resume.sh";' \
         "$hookdir" >> $hookdir/initqueue/timeout/resume.sh