From 3b6f865b011efd025e867bd2a7bb1f880b5d58e0 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sun, 10 Jun 2018 15:41:52 +0200 Subject: [PATCH] base-files: sysupgrade: fix handing get_image unpack commands On bcm53xx and brcm47xx, commands are passed to default_do_upgrade that expect the image to be passed on stdin, rather than as an argument. Fixes: 30f61a34b4cf ("base-files: always use staged sysupgrade") Signed-off-by: Matthias Schiffer --- package/base-files/files/lib/upgrade/common.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh index 5f5c9dc8a31..38056fd346b 100644 --- a/package/base-files/files/lib/upgrade/common.sh +++ b/package/base-files/files/lib/upgrade/common.sh @@ -78,18 +78,18 @@ rootfs_type() { get_image() { # [ ] local from="$1" - local cat="$2" + local cmd="$2" - if [ -z "$cat" ]; then + if [ -z "$cmd" ]; then local magic="$(dd if="$from" bs=2 count=1 2>/dev/null | hexdump -n 2 -e '1/1 "%02x"')" case "$magic" in - 1f8b) cat="zcat";; - 425a) cat="bzcat";; - *) cat="cat";; + 1f8b) cmd="zcat";; + 425a) cmd="bzcat";; + *) cmd="cat";; esac fi - $cat "$from" 2>/dev/null + cat "$from" 2>/dev/null | $cmd } get_magic_word() { -- 2.30.2