aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/x86
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2014-06-02 12:43:22 +0000
committerJohn Crispin <john@openwrt.org>2014-06-02 12:43:22 +0000
commitf933a741a9c44cea58b2b3837dca99fc55d0b957 (patch)
treeb87ca90d9e7b0432bfda4c69a8fef02d08f8e748 /target/linux/x86
parenta866b7eb9d45ecb986c275cbd2033322b54d2606 (diff)
downloadupstream-f933a741a9c44cea58b2b3837dca99fc55d0b957.tar.gz
upstream-f933a741a9c44cea58b2b3837dca99fc55d0b957.tar.bz2
upstream-f933a741a9c44cea58b2b3837dca99fc55d0b957.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> SVN-Revision: 40915
Diffstat (limited to 'target/linux/x86')
-rw-r--r--target/linux/x86/base-files/lib/upgrade/platform.sh2
-rw-r--r--target/linux/x86/olpc/base-files/lib/upgrade/platform.sh2
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;;