From 0ff31640421c628f6405f667f1404b1d74ea396b Mon Sep 17 00:00:00 2001

From: Harald Hoyer <harald@redhat.com>

Date: Wed, 7 May 2014 15:30:01 +0200

Subject: [PATCH] resume/parse-resume.sh: correctly write timeout hook

---

 modules.d/95resume/parse-resume.sh | 7 ++++---

 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules.d/95resume/parse-resume.sh b/modules.d/95resume/parse-resume.sh

index d7b2d7f96a..6ab59c359a 100755

--- a/modules.d/95resume/parse-resume.sh

+++ b/modules.d/95resume/parse-resume.sh

@@ -70,9 +70,10 @@ if ! getarg noresume; then

         printf '[ -e "%s" ] && { ln -s "%s" /dev/resume; rm -f -- "$job" "%s/initqueue/timeout/resume.sh"; }\n' \

             "$resume" "$resume" "$hookdir" >> $hookdir/initqueue/settled/resume.sh

-        printf -- "%s" 'warn "Cancelling resume operation. Device not found.";'

-        printf -- ' cancel_wait_for_dev /dev/resume; rm -f -- "$job" "%s/initqueue/settled/resume.sh";\n' \

-            "$hookdir" >> $hookdir/initqueue/timeout/resume.sh

+        {

+            printf -- "%s" 'warn "Cancelling resume operation. Device not found.";'

+            printf -- ' cancel_wait_for_dev /dev/resume; rm -f -- "$job" "%s/initqueue/settled/resume.sh";\n' "$hookdir"

+        } >> $hookdir/initqueue/timeout/resume.sh

         mv /lib/dracut/resume.sh /lib/dracut/hooks/pre-mount/10-resume.sh

     else

-- 

1.9.3