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
commitbd652ee26815b94ea18e0d2da72943de18d5994a (patch)
treeb44ed43b2a831207dc446c32a98d69fbcd7fab75
parentca2f13b68b2c19622155573888ac695a896b2db7 (diff)
downloadupstream-bd652ee26815b94ea18e0d2da72943de18d5994a.tar.gz
upstream-bd652ee26815b94ea18e0d2da72943de18d5994a.tar.bz2
upstream-bd652ee26815b94ea18e0d2da72943de18d5994a.zip
[procd]: we already have a get_magic_long() in common.sh for sysupgrade, don't break it
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41628 3c298f89-4303-0410-b956-a3cf2f4a3e73
-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() {