dracut: update to 038.

This commit is contained in:
Juan RP 2014-06-30 12:18:55 +02:00
parent 67947330cc
commit c05528a08c
3 changed files with 3 additions and 44 deletions

View file

@ -1,13 +0,0 @@
typo fix that avoids '1=""' in generated vconsole.conf.
--- modules.d/10i18n/parse-i18n.sh.orig 2014-04-28 12:44:54.540715927 +0200
+++ modules.d/10i18n/parse-i18n.sh 2014-04-28 12:45:10.587813907 +0200
@@ -12,7 +12,7 @@ inst_key_val() {
_value="$(getarg $@)"
[ -z "${_value}" ] && _value=$_default
if [ -n "${_value}" ]; then
- printf '%s="%s"\n' $key ${_value} >> $_file
+ printf '%s="%s"\n' ${_key} ${_value} >> $_file
fi
unset _file
unset _value

View file

@ -1,27 +0,0 @@
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'
pkgname=dracut
version=037
revision=3
version=038
revision=1
build_style=meta
hostmakedepends="libxslt docbook-xsl asciidoc"
makedepends="psmisc cpio xz"
@ -15,12 +15,11 @@ short_desc="A new initramfs infrastructure"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
distfiles="${KERNEL_SITE}/utils/boot/$pkgname/$pkgname-$version.tar.xz"
checksum=9c4c365c8dabc19b66da2972bbed7b983df520481325b8a37d3f620218620d76
checksum=3b0d4466ff5bb627fcc783f02a757187195567b97bdbf46203dfa4cf52ed6b70
do_build() {
make ${makejobs} sysconfdir=/etc systemdsystemunitdir=/usr/lib/systemd/system
}
do_install() {
# fix path to busybox.
sed -i "s|/sbin/busybox|/bin/busybox|g" modules.d/05busybox/module-setup.sh