mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
15cb19f02a
sysupgrade command fails due to missing U-Boot environment-processing binaries on sysupgrade ramdisk. The missing binaries result in the following output: Switching to ramdisk... Performing system upgrade... ash: /usr/sbin/fw_printenv: not found ash: fw_setenv: not found ash: touch: not found cannot find target partition Fixes FS#197. Signed-off-by: Aaron Curley <accwebs@gmail.com>
94 lines
2.3 KiB
Bash
94 lines
2.3 KiB
Bash
#
|
|
# Copyright (C) 2014-2015 OpenWrt.org
|
|
#
|
|
|
|
linksys_get_target_firmware() {
|
|
cur_boot_part=`/usr/sbin/fw_printenv -n boot_part`
|
|
target_firmware=""
|
|
if [ "$cur_boot_part" = "1" ]
|
|
then
|
|
# current primary boot - update alt boot
|
|
target_firmware="kernel2"
|
|
fw_setenv boot_part 2
|
|
fw_setenv bootcmd "run altnandboot"
|
|
elif [ "$cur_boot_part" = "2" ]
|
|
then
|
|
# current alt boot - update primary boot
|
|
target_firmware="kernel1"
|
|
fw_setenv boot_part 1
|
|
fw_setenv bootcmd "run nandboot"
|
|
fi
|
|
|
|
# re-enable recovery so we get back if the new firmware is broken
|
|
fw_setenv auto_recovery yes
|
|
|
|
echo "$target_firmware"
|
|
}
|
|
|
|
linksys_get_root_magic() {
|
|
(get_image "$@" | dd skip=786432 bs=4 count=1 | hexdump -v -n 4 -e '1/1 "%02x"') 2>/dev/null
|
|
}
|
|
|
|
platform_do_upgrade_linksys() {
|
|
local magic_long="$(get_magic_long "$1")"
|
|
|
|
mkdir -p /var/lock
|
|
local part_label="$(linksys_get_target_firmware)"
|
|
touch /var/lock/fw_printenv.lock
|
|
|
|
if [ ! -n "$part_label" ]
|
|
then
|
|
echo "cannot find target partition"
|
|
exit 1
|
|
fi
|
|
|
|
local target_mtd=$(find_mtd_part $part_label)
|
|
|
|
[ "$magic_long" = "73797375" ] && {
|
|
CI_KERNPART="$part_label"
|
|
if [ "$part_label" = "kernel1" ]
|
|
then
|
|
CI_UBIPART="rootfs1"
|
|
else
|
|
CI_UBIPART="rootfs2"
|
|
fi
|
|
|
|
nand_upgrade_tar "$1"
|
|
}
|
|
[ "$magic_long" = "27051956" ] && {
|
|
# check firmwares' rootfs types
|
|
local target_mtd=$(find_mtd_part $part_label)
|
|
local oldroot="$(linksys_get_root_magic $target_mtd)"
|
|
local newroot="$(linksys_get_root_magic "$1")"
|
|
|
|
if [ "$newroot" = "55424923" -a "$oldroot" = "55424923" ]
|
|
# we're upgrading from a firmware with UBI to one with UBI
|
|
then
|
|
# erase everything to be safe
|
|
mtd erase $part_label
|
|
get_image "$1" | mtd -n write - $part_label
|
|
else
|
|
get_image "$1" | mtd write - $part_label
|
|
fi
|
|
}
|
|
}
|
|
|
|
linksys_preupgrade() {
|
|
local board=$(mvebu_board_name)
|
|
|
|
case "$board" in
|
|
armada-385-linksys-caiman|armada-385-linksys-cobra|armada-385-linksys-shelby|armada-xp-linksys-mamba)
|
|
export RAMFS_COPY_BIN="${RAMFS_COPY_BIN} /usr/sbin/fw_printenv /usr/sbin/fw_setenv"
|
|
export RAMFS_COPY_BIN="${RAMFS_COPY_BIN} /bin/mkdir /bin/touch"
|
|
export RAMFS_COPY_DATA="${RAMFS_COPY_DATA} /etc/fw_env.config /var/lock/fw_printenv.lock"
|
|
|
|
[ -f /tmp/sysupgrade.tgz ] && {
|
|
cp /tmp/sysupgrade.tgz /tmp/syscfg/sysupgrade.tgz
|
|
}
|
|
;;
|
|
esac
|
|
}
|
|
|
|
append sysupgrade_pre_upgrade linksys_preupgrade
|
|
|