aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2013-05-05 12:41:42 +0000
committerJohn Crispin <blogic@openwrt.org>2013-05-05 12:41:42 +0000
commit15816c9ccebfd6b774cc85b7038ac4f4aefeb55d (patch)
treea526a6c9117cb441d0f89bd6fc5d4a47fd015015
parent0521965d25c1f032d22fadca1e3d99feaabf26b1 (diff)
downloadupstream-15816c9ccebfd6b774cc85b7038ac4f4aefeb55d.tar.gz
upstream-15816c9ccebfd6b774cc85b7038ac4f4aefeb55d.tar.bz2
upstream-15816c9ccebfd6b774cc85b7038ac4f4aefeb55d.zip
sysupgrade: fixes broken pipe error during sysupgade
Signed-off-by: John Crispin <blogic@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36548 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/base-files/files/lib/upgrade/common.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh
index fbe54a5ee5..6bb36db489 100644
--- a/package/base-files/files/lib/upgrade/common.sh
+++ b/package/base-files/files/lib/upgrade/common.sh
@@ -157,14 +157,14 @@ get_image() { # <source> [ <command> ]
*) cmd="cat";;
esac
if [ -z "$conc" ]; then
- local magic="$(eval $cmd $from | dd bs=2 count=1 2>/dev/null | hexdump -n 2 -e '1/1 "%02x"')"
+ local magic="$(eval $cmd $from 2>/dev/null | dd bs=2 count=1 2>/dev/null | hexdump -n 2 -e '1/1 "%02x"')"
case "$magic" in
1f8b) conc="zcat";;
425a) conc="bzcat";;
esac
fi
- eval "$cmd $from ${conc:+| $conc}"
+ eval "$cmd $from 2>/dev/null ${conc:+| $conc}"
}
get_magic_word() {