diff options
| author | John Crispin <blogic@openwrt.org> | 2014-06-02 12:43:22 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2014-06-02 12:43:22 +0000 |
| commit | 38c81b255268fc9f02ee7c16fa41682888acc15c (patch) | |
| tree | 3fff04ad6da85477a00a70ea32e7d4cb2e349a88 /target/linux/x86 | |
| parent | 3b660e40792f3c01b9e6abc87427be700462a0b9 (diff) | |
| download | master-187ad058-38c81b255268fc9f02ee7c16fa41682888acc15c.tar.gz master-187ad058-38c81b255268fc9f02ee7c16fa41682888acc15c.tar.bz2 master-187ad058-38c81b255268fc9f02ee7c16fa41682888acc15c.zip | |
target/linux/*/base-files/lib/upgrade/platform.sh - wrong check for ARGC
ARGC is a 'C-ism', but not known/valid in shell-syntax - insert the correct
var $# (=number of args) here. under normal conditions this had no impact,
but we should at least correct it. the error was observable like this:
root@box:~ [ -e "/etc/functions.sh" ] && . /etc/functions.sh
root@box:~ [ -e "/lib/functions.sh" ] && . /lib/functions.sh
root@box:~ . /lib/upgrade/platform.sh
root@box:~ . /lib/upgrade/common.sh
root@box:~ platform_check_image /tmp/myfirmware.bin
ash: bad number
root@box:~ echo $?
0
Signed-off-by: Bastian Bittorf <bittorf@bluebottle.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40915 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/x86')
| -rw-r--r-- | target/linux/x86/base-files/lib/upgrade/platform.sh | 2 | ||||
| -rw-r--r-- | target/linux/x86/olpc/base-files/lib/upgrade/platform.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/x86/base-files/lib/upgrade/platform.sh b/target/linux/x86/base-files/lib/upgrade/platform.sh index 9503d5db88..a2dd20a881 100644 --- a/target/linux/x86/base-files/lib/upgrade/platform.sh +++ b/target/linux/x86/base-files/lib/upgrade/platform.sh @@ -14,7 +14,7 @@ x86_get_rootfs() { } platform_check_image() { - [ "$ARGC" -gt 1 ] && return 1 + [ "$#" -gt 1 ] && return 1 case "$(get_magic_word "$1")" in eb48|eb63) return 0;; diff --git a/target/linux/x86/olpc/base-files/lib/upgrade/platform.sh b/target/linux/x86/olpc/base-files/lib/upgrade/platform.sh index ffd0b93ab4..c90a4ce1c4 100644 --- a/target/linux/x86/olpc/base-files/lib/upgrade/platform.sh +++ b/target/linux/x86/olpc/base-files/lib/upgrade/platform.sh @@ -1,5 +1,5 @@ platform_check_image() { - [ "$ARGC" -gt 1 ] && return 1 + [ "$#" -gt 1 ] && return 1 case "$(get_magic_word "$1")" in 48eb) return 0;; |