From: Imre Kaloz <kaloz@openwrt.org>
Date: Sun, 13 Jul 2014 20:51:17 +0000 (+0000)
Subject: we already have a get_magic_long() in common.sh for sysupgrade, don't break it
X-Git-Tag: reboot~6553
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2ddcf5dd8a3e009321b761205d0c048d2862908b;p=openwrt%2Fstaging%2Fjogo.git

we already have a get_magic_long() in common.sh for sysupgrade, don't break it

Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 41628
---

diff --git a/package/system/procd/files/nand.sh b/package/system/procd/files/nand.sh
index 032f02a47e..5f307d09b0 100644
--- a/package/system/procd/files/nand.sh
+++ b/package/system/procd/files/nand.sh
@@ -36,7 +36,7 @@ nand_find_ubi() {
 	done
 }
 
-get_magic_long() {
+nand_get_magic_long() {
 	dd if="$1" skip=$2 bs=4 count=1 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"'
 }
 
@@ -70,7 +70,7 @@ identify_magic() {
 
 
 identify() {
-	identify_magic $(get_magic_long "$1" "${2:-0}")
+	identify_magic $(nand_get_magic_long "$1" "${2:-0}")
 }
 
 identify_tar() {