From 26bd1dcc6a67dcecf869ee0d5b69b460aaa8e676 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 7 May 2014 15:34:13 +0200 Subject: [PATCH] dracut: another bugfix for the resume module found by yours truly. --- srcpkgs/dracut/patches/fix-parse-resume.patch | 27 +++++++++++++++++++ srcpkgs/dracut/template | 2 +- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/dracut/patches/fix-parse-resume.patch diff --git a/srcpkgs/dracut/patches/fix-parse-resume.patch b/srcpkgs/dracut/patches/fix-parse-resume.patch new file mode 100644 index 00000000000..4cc566c6bac --- /dev/null +++ b/srcpkgs/dracut/patches/fix-parse-resume.patch @@ -0,0 +1,27 @@ +From 636cc1ef634704ffc5e037961b6fb8ede3203977 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Wed, 7 May 2014 15:30:01 +0200 +Subject: resume/parse-resume.sh: correctly write timeout hook + + +diff --git a/modules.d/95resume/parse-resume.sh b/modules.d/95resume/parse-resume.sh +index d7b2d7f..6ab59c3 100755 +--- modules.d/95resume/parse-resume.sh ++++ 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 +-- +cgit v0.10.1 + diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template index 451b7f929f8..066545ceba0 100644 --- a/srcpkgs/dracut/template +++ b/srcpkgs/dracut/template @@ -1,7 +1,7 @@ # Template file for 'dracut' pkgname=dracut version=037 -revision=2 +revision=3 build_style=meta hostmakedepends="libxslt docbook-xsl asciidoc" makedepends="psmisc cpio xz"