projects
/
openwrt
/
staging
/
kaloz.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e9f664c
)
base-files: properly remove stderr from zcat/bzcat
author
John Crispin
<john@openwrt.org>
Wed, 11 Jun 2014 13:00:25 +0000
(13:00 +0000)
committer
John Crispin
<john@openwrt.org>
Wed, 11 Jun 2014 13:00:25 +0000
(13:00 +0000)
Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 41135
package/base-files/files/lib/upgrade/common.sh
patch
|
blob
|
history
diff --git
a/package/base-files/files/lib/upgrade/common.sh
b/package/base-files/files/lib/upgrade/common.sh
index 11de82904c620a73a73c6d814241b29103d62d19..91e61ba4f8bc0c89b506394e14807ad4a86fd3c2 100644
(file)
--- 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() {