aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2014-06-11 13:00:25 +0000
committerJohn Crispin <john@openwrt.org>2014-06-11 13:00:25 +0000
commitbedd6f44a5f7f812f77e20d294f562223af796da (patch)
tree7bb06dc7aabbb0e939c71e3c6cc62608a6a26516
parente9f664c87974600ab5f0f1612a03548e7785e85f (diff)
downloadupstream-bedd6f44a5f7f812f77e20d294f562223af796da.tar.gz
upstream-bedd6f44a5f7f812f77e20d294f562223af796da.tar.bz2
upstream-bedd6f44a5f7f812f77e20d294f562223af796da.zip
base-files: properly remove stderr from zcat/bzcat
Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 41135
-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 11de82904c..91e61ba4f8 100644
--- a/package/base-files/files/lib/upgrade/common.sh
+++ b/package/base-files/files/lib/upgrade/common.sh
@@ -182,11 +182,11 @@ get_image() { # <source> [ <command> ]
}
get_magic_word() {
- get_image "$@" | dd bs=2 count=1 2>/dev/null | hexdump -v -n 2 -e '1/1 "%02x"'
+ (get_image "$@" | dd bs=2 count=1 | hexdump -v -n 2 -e '1/1 "%02x"') 2>/dev/null
}
get_magic_long() {
- get_image "$@" | dd bs=4 count=1 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"'
+ (get_image "$@" | dd bs=4 count=1 | hexdump -v -n 4 -e '1/1 "%02x"') 2>/dev/null
}
jffs2_copy_config() {