aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2014-06-11 13:00:25 +0000
committerJohn Crispin <blogic@openwrt.org>2014-06-11 13:00:25 +0000
commitee158312ebc1f270627c089ae426573b3c39f6a4 (patch)
tree9df7c56ae706df326f97e5c70891557154fa2988 /package
parentf4b2acaeea20b9fc1e57f4a0eaa9c7807c2365d1 (diff)
downloadupstream-ee158312ebc1f270627c089ae426573b3c39f6a4.tar.gz
upstream-ee158312ebc1f270627c089ae426573b3c39f6a4.tar.bz2
upstream-ee158312ebc1f270627c089ae426573b3c39f6a4.zip
base-files: properly remove stderr from zcat/bzcat
Signed-off-by: John Crispin <blogic@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41135 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-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() {