Author: blogic Date: 2014-06-11 15:00:25 +0200 (Wed, 11 Jun 2014) New Revision: 41135
Modified: trunk/package/base-files/files/lib/upgrade/common.sh Log: base-files: properly remove stderr from zcat/bzcat Signed-off-by: John Crispin <[email protected]> Modified: trunk/package/base-files/files/lib/upgrade/common.sh =================================================================== --- trunk/package/base-files/files/lib/upgrade/common.sh 2014-06-11 13:00:17 UTC (rev 41134) +++ trunk/package/base-files/files/lib/upgrade/common.sh 2014-06-11 13:00:25 UTC (rev 41135) @@ -182,11 +182,11 @@ } 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() { _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
