dracut: another bugfix for the resume module found by yours truly.

This commit is contained in:
Juan RP 2014-05-07 15:34:13 +02:00
parent 2f0bdfa802
commit 26bd1dcc6a
2 changed files with 28 additions and 1 deletions

View File

@ -0,0 +1,27 @@
From 636cc1ef634704ffc5e037961b6fb8ede3203977 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
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

View File

@ -1,7 +1,7 @@
# Template file for 'dracut' # Template file for 'dracut'
pkgname=dracut pkgname=dracut
version=037 version=037
revision=2 revision=3
build_style=meta build_style=meta
hostmakedepends="libxslt docbook-xsl asciidoc" hostmakedepends="libxslt docbook-xsl asciidoc"
makedepends="psmisc cpio xz" makedepends="psmisc cpio xz"