target/linux/*/base-files/lib/upgrade/platform.sh - wrong check for ARGC

[openwrt/staging/dedeckeh.git] / target / linux / ixp4xx / base-files / lib / upgrade / platform.sh

diff --git a/target/linux/ixp4xx/base-files/lib/upgrade/platform.sh b/target/linux/ixp4xx/base-files/lib/upgrade/platform.sh
index 63be29315cfd1dd92250cfaadf0d2d70dbfa5cb3..508a167419edf1a405b23d9ae15d4c5575a9ad47 100644 (file)
--- a/target/linux/ixp4xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ixp4xx/base-files/lib/upgrade/platform.sh
@@ -2,9 +2,6 @@
 
 RAMFS_COPY_DATA="/lib/ixp4xx.sh"
 
-# testing
-RAMFS_COPY_BIN="/usr/bin/less /usr/bin/hexdump"
-
 CI_BLKSZ=65536
 CI_LDADR=0x00800000
 
@@ -64,7 +61,7 @@ platform_do_upgrade_combined() {
        v "kernel_part_size=$kern_part_size"
        v "kernel_part_blocks=$kern_part_blocks"
        v "kern_length=$kern_length"
-       v "erase_size=$erase_size" 
+       v "erase_size=$erase_size"
        v "kern_blocks=$kern_blocks"
        v "root_blocks=$root_blocks"
        v "kern_pad_blocks=$(($kern_part_blocks-$kern_blocks))"
@@ -96,7 +93,7 @@ platform_check_image() {
        local kern_part_size=0x$(platform_find_part_size "$kernelpart")
        local kern_length=0x$(dd if="$1" bs=2 skip=1 count=4 2>/dev/null)
 
-       [ "$ARGC" -gt 1 ] && return 1
+       [ "$#" -gt 1 ] && return 1
 
        case "$board" in
        avila | cambria )
@@ -110,7 +107,7 @@ platform_check_image() {
                if [ $kern_length_b -gt $kern_part_size_b ]; then
                        echo "Invalid image. Kernel size ($kern_length) exceeds kernel partition ($kern_part_size)"
                        return 1
-               fi 
+               fi
 
                local md5_img=$(dd if="$1" bs=2 skip=9 count=16 2>/dev/null)
                local md5_chk=$(dd if="$1" bs=$CI_BLKSZ skip=1 2>/dev/null | md5sum -); md5_chk="${md5_chk%% *}"