From 90d99e475616b9819226afcf09b866fa2fcd9985 Mon Sep 17 00:00:00 2001 From: maximilian attems Date: Mon, 5 Jul 2010 17:57:15 +0200 Subject: mkinitramfs: Fix missing compress quotings the fallback for unset ${compress} never got used, due to the missing quotes. Do also set the GZIP CONFIG option when setting fallback of gzip. Closes: 587608 Thanks: Valentin QUEQUET Signed-off-by: maximilian attems --- mkinitramfs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mkinitramfs b/mkinitramfs index e49e01c..3a2feae 100755 --- a/mkinitramfs +++ b/mkinitramfs @@ -134,8 +134,9 @@ else COMPRESS=${compress} fi -if ! command -v ${compress} >/dev/null 2>&1; then +if ! command -v "${compress}" >/dev/null 2>&1; then compress=gzip + COMPRESS=GZIP [ "${verbose}" = y ] && \ echo "No ${COMPRESS} in ${PATH}, using gzip" fi @@ -321,7 +322,7 @@ eval ` find . 4>&-; echo "ec1=$?;" >&4 } | { cpio --quiet --dereference -o -H newc 4>&-; echo "ec2=$?;" >&4 - } | ${compress} >"${outfile}" + } | "${compress}" >"${outfile}" echo "ec3=$?;" >&4 ` if [ "$ec1" -ne 0 ]; then exit "$ec1"; fi -- cgit v1.2.3 From 89a79c1c9f15220a377fd11d49687e17b2958062 Mon Sep 17 00:00:00 2001 From: maximilian attems Date: Mon, 5 Jul 2010 21:53:52 +0200 Subject: release 0.97.1 urgency high as it fixes initramfs-tools compress handling. Signed-off-by: maximilian attems --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index a3e8189..bccde47 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +initramfs-tools (0.97.1) unstable; urgency=high + + * [90d99e4] mkinitramfs: Fix initramfs generation without COMPRESS set. + (Closes: 587608) - thanks Valentin QUEQUET + + -- maximilian attems Mon, 05 Jul 2010 21:50:47 +0200 + initramfs-tools (0.97) unstable; urgency=low [ Martin Michlmayr ] -- cgit v1.2.3 From ce732c34bed22a712591f8459d8a0bb59ac91856 Mon Sep 17 00:00:00 2001 From: maximilian attems Date: Tue, 6 Jul 2010 12:51:12 +0200 Subject: initramfs-tools: output name of script that errexits. this should make bug reports concerning bogus hook scripts easier to handle, like the *loooong* iscan story. Closes: 586554 Signed-off-by: maximilian attems --- scripts/functions | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/functions b/scripts/functions index 56ae1e1..1292fd6 100644 --- a/scripts/functions +++ b/scripts/functions @@ -211,7 +211,6 @@ get_prereq_pairs() call_scripts() { - # allow hooks to abort build: set -e for cs_x in ${runlist}; do [ -f ${initdir}/${cs_x} ] || continue @@ -219,7 +218,12 @@ call_scripts() if [ "${verbose}" = "y" ]; then echo "Calling hook ${cs_x}" fi - ${initdir}/${cs_x} + ${initdir}/${cs_x} && ec=$? || ec=$? + # allow hooks to abort build: + if [ "$ec" -ne 0 ]; then + echo "E: ${initdir}/${cs_x} failed with return $ec." + exit $ec + fi # allow boot scripts to modify exported boot paramaters if [ -e /conf/param.conf ]; then . /conf/param.conf -- cgit v1.2.3 From d78e243c8f73a16a307579c6df7683af6db8227a Mon Sep 17 00:00:00 2001 From: maximilian attems Date: Tue, 6 Jul 2010 12:59:13 +0200 Subject: release 0.97.2 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index bccde47..9d667e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +initramfs-tools (0.97.2) unstable; urgency=high + + * [ce732c3] initramfs-tools: output name of script that errexits. + (Closes: 586554) + + -- maximilian attems Tue, 06 Jul 2010 12:58:37 +0200 + initramfs-tools (0.97.1) unstable; urgency=high * [90d99e4] mkinitramfs: Fix initramfs generation without COMPRESS set. -- cgit v1.2.3