summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2014-03-30 01:47:11 +0100
committerDave Reisner <dreisner@archlinux.org>2014-03-30 16:24:15 +0200
commitcfae62080565cc5100834906a5e9994e094335f4 (patch)
treebc4fdd22f0a58a6f38b8d6c9c61dd372446092cb
parentd90c1fb02faa0a5aeca6410a72d52d53ddf2455e (diff)
downloadmkinitcpio-cfae62080565cc5100834906a5e9994e094335f4.tar.gz
mkinitcpio-cfae62080565cc5100834906a5e9994e094335f4.tar.xz
make missing compression binaries a non-fatal warning
Fallback on no compression at all, since we don't want to make potentially poor assumptions about what the kernel might support. Fixes FS#39659.
-rwxr-xr-xmkinitcpio12
1 files changed, 10 insertions, 2 deletions
diff --git a/mkinitcpio b/mkinitcpio
index 42abde7..01fe8ba 100755
--- a/mkinitcpio
+++ b/mkinitcpio
@@ -196,9 +196,16 @@ build_image() {
local out=$1 compress=$2 errmsg=
local -a pipesave cpio_opts
- msg "Creating $compress initcpio image: %s" "$out"
+ if [[ $compress = cat ]]; then
+ msg "Creating uncompressed initcpio image: %s" "$out"
+ else
+ msg "Creating %s-compressed initcpio image: %s" "$compress" "$out"
+ fi
case $compress in
+ cat)
+ unset COMPRESSION_OPTIONS
+ ;;
xz)
COMPRESSION_OPTIONS+=' --check=crc32'
;;
@@ -460,7 +467,8 @@ if [[ $_optgenimg ]]; then
_optcompress=${_optcompress:-${COMPRESSION:-gzip}}
if ! type -P "$_optcompress" >/dev/null; then
- die "Unable to locate compression method: %s" "$_optcompress"
+ warning "Unable to locate compression method: %s" "$_optcompress"
+ _optcompress=cat
fi
msg "Starting build: %s" "$KERNELVERSION"