summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormaximilian attems <maks@debian.org>2010-07-05 17:57:15 +0200
committermaximilian attems <maks@debian.org>2010-07-05 18:02:50 +0200
commit3bdc6b1d6419359309f261d045bf9c78269b9292 (patch)
treede3cb1215b22de953d2df02e09f35b04ca9ad6ec
parentc327689d1a2f1620e63f0f5fb8264e106444c644 (diff)
downloadinitramfs-tools-3bdc6b1d6419359309f261d045bf9c78269b9292.tar.gz
initramfs-tools-3bdc6b1d6419359309f261d045bf9c78269b9292.zip
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 <valentin.quequet@orange.fr> Signed-off-by: maximilian attems <maks@debian.org>
-rwxr-xr-xmkinitramfs5
1 files changed, 3 insertions, 2 deletions
diff --git a/mkinitramfs b/mkinitramfs
index bccdbed..1d74e76 100755
--- a/mkinitramfs
+++ b/mkinitramfs
@@ -136,8 +136,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
@@ -323,7 +324,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