aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2014-07-13 20:51:17 +0000
committerImre Kaloz <kaloz@openwrt.org>2014-07-13 20:51:17 +0000
commit2ddcf5dd8a3e009321b761205d0c048d2862908b (patch)
treeb8467e44983e57dc620298973c9f5db4d305d4d0
parent26b39cc580150ec8d677f9f16498f63b81cd0197 (diff)
downloadupstream-2ddcf5dd8a3e009321b761205d0c048d2862908b.tar.gz
upstream-2ddcf5dd8a3e009321b761205d0c048d2862908b.tar.bz2
upstream-2ddcf5dd8a3e009321b761205d0c048d2862908b.zip
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
-rw-r--r--package/system/procd/files/nand.sh4
1 files changed, 2 insertions, 2 deletions
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() {