From f933a741a9c44cea58b2b3837dca99fc55d0b957 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Mon, 2 Jun 2014 12:43:22 +0000 Subject: 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 SVN-Revision: 40915 --- target/linux/x86/base-files/lib/upgrade/platform.sh | 2 +- target/linux/x86/olpc/base-files/lib/upgrade/platform.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'target/linux/x86') diff --git a/target/linux/x86/base-files/lib/upgrade/platform.sh b/target/linux/x86/base-files/lib/upgrade/platform.sh index 9503d5d..a2dd20a 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 ffd0b93..c90a4ce 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;; -- cgit v1.1