f933a741a9
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
44 lines
1 KiB
Bash
44 lines
1 KiB
Bash
x86_get_rootfs() {
|
|
local rootfsdev
|
|
local rootfstype
|
|
|
|
rootfstype="$(awk 'BEGIN { RS=" "; FS="="; } ($1 == "rootfstype") { print $2 }' < /proc/cmdline)"
|
|
case "$rootfstype" in
|
|
squashfs|jffs2)
|
|
rootfsdev="$(awk 'BEGIN { RS=" "; FS="="; } ($1 == "block2mtd.block2mtd") { print substr($2,1,index($2, ",")-1) }' < /proc/cmdline)";;
|
|
ext4)
|
|
rootfsdev="$(awk 'BEGIN { RS=" "; FS="="; } ($1 == "root") { print $2 }' < /proc/cmdline)";;
|
|
esac
|
|
|
|
echo "$rootfstype:$rootfsdev"
|
|
}
|
|
|
|
platform_check_image() {
|
|
[ "$#" -gt 1 ] && return 1
|
|
|
|
case "$(get_magic_word "$1")" in
|
|
eb48|eb63) return 0;;
|
|
*)
|
|
echo "Invalid image type"
|
|
return 1
|
|
;;
|
|
esac
|
|
}
|
|
|
|
platform_copy_config() {
|
|
local rootfs="$(x86_get_rootfs)"
|
|
local rootfsdev="${rootfs##*:}"
|
|
|
|
mount -t ext4 -o rw,noatime "${rootfsdev%[0-9]}1" /mnt
|
|
cp -af "$CONF_TAR" /mnt/
|
|
umount /mnt
|
|
}
|
|
|
|
platform_do_upgrade() {
|
|
local rootfs="$(x86_get_rootfs)"
|
|
local rootfsdev="${rootfs##*:}"
|
|
|
|
sync
|
|
[ -b ${rootfsdev%[0-9]} ] && get_image "$@" | dd of=${rootfsdev%[0-9]} bs=4096 conv=fsync
|
|
sleep 1
|
|
}
|