mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 17:18:59 +00:00
ff91a12c8d
It appears that the refactor of the upgrade process for NAND devices resulted in the nand_do_upgrade_success step not being called for devices using the linksys.sh script. As a result, configuration was not preserved over sysupgrade steps. This corrects a typo in the call of nand_do_upgrade_failed for ipq40xx and ipq806x devices using the linksys.sh script. Fixes:8634c1080d("ipq40xx: Fix Linksys upgrade, restore config step") Fixes:2715aff5df("ipq806x: Fix Linksys upgrade, restore config step") Signed-off-by: Michael Trinidad <trinidude4@hotmail.com>
126 lines
2.6 KiB
Bash
126 lines
2.6 KiB
Bash
linksys_get_target_firmware() {
|
|
local cur_boot_part mtd_ubi0
|
|
|
|
cur_boot_part="$(/usr/sbin/fw_printenv -n boot_part)"
|
|
if [ -z "${cur_boot_part}" ]; then
|
|
mtd_ubi0=$(cat /sys/class/ubi/ubi0/mtd_num)
|
|
case "$(grep -E "^mtd${mtd_ubi0}:" /proc/mtd | cut -d '"' -f 2)" in
|
|
kernel|rootfs)
|
|
cur_boot_part=1
|
|
;;
|
|
alt_kernel|alt_rootfs)
|
|
cur_boot_part=2
|
|
;;
|
|
esac
|
|
>&2 printf "Current boot_part='%s' selected from ubi0/mtd_num='%s'" \
|
|
"${cur_boot_part}" "${mtd_ubi0}"
|
|
fi
|
|
|
|
# OEM U-Boot for EA6350v3, EA8300 and MR8300; bootcmd=
|
|
# if test $auto_recovery = no;
|
|
# then bootipq;
|
|
# elif test $boot_part = 1;
|
|
# then run bootpart1;
|
|
# else run bootpart2;
|
|
# fi
|
|
|
|
case "$cur_boot_part" in
|
|
1)
|
|
fw_setenv -s - <<-EOF
|
|
boot_part 2
|
|
auto_recovery yes
|
|
EOF
|
|
printf "alt_kernel"
|
|
return
|
|
;;
|
|
2)
|
|
fw_setenv -s - <<-EOF
|
|
boot_part 1
|
|
auto_recovery yes
|
|
EOF
|
|
printf "kernel"
|
|
return
|
|
;;
|
|
*)
|
|
return
|
|
;;
|
|
esac
|
|
}
|
|
|
|
linksys_is_factory_image() {
|
|
local board=$(board_name)
|
|
board=${board##*,}
|
|
|
|
# check matching footer signature
|
|
tail -c 256 $1 | grep -q -i "\.LINKSYS\.........${board}"
|
|
}
|
|
|
|
platform_do_upgrade_linksys() {
|
|
local magic_long="$(get_magic_long "$1")"
|
|
|
|
local rm_oem_fw_vols="squashfs ubifs" # from OEM [alt_]rootfs UBI
|
|
local vol
|
|
|
|
mkdir -p /var/lock
|
|
local part_label="$(linksys_get_target_firmware)"
|
|
touch /var/lock/fw_printenv.lock
|
|
|
|
if [ -z "$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" = "kernel" ]; then
|
|
CI_UBIPART="rootfs"
|
|
else
|
|
CI_UBIPART="alt_rootfs"
|
|
fi
|
|
|
|
local mtdnum="$(find_mtd_index "$CI_UBIPART")"
|
|
if [ ! "$mtdnum" ]; then
|
|
echo "cannot find ubi mtd partition $CI_UBIPART"
|
|
return 1
|
|
fi
|
|
|
|
local ubidev="$(nand_find_ubi "$CI_UBIPART")"
|
|
if [ ! "$ubidev" ]; then
|
|
ubiattach -m "$mtdnum"
|
|
sync
|
|
ubidev="$(nand_find_ubi "$CI_UBIPART")"
|
|
fi
|
|
|
|
if [ "$ubidev" ]; then
|
|
for vol in $rm_oem_fw_vols; do
|
|
ubirmvol "/dev/$ubidev" -N "$vol" 2>/dev/null
|
|
done
|
|
fi
|
|
|
|
# complete std upgrade
|
|
if nand_upgrade_tar "$1" ; then
|
|
nand_do_upgrade_success
|
|
else
|
|
nand_do_upgrade_failed
|
|
fi
|
|
|
|
}
|
|
|
|
[ "$magic_long" = "27051956" ] && {
|
|
echo "writing \"$1\" image to \"$part_label\""
|
|
get_image "$1" | mtd write - "$part_label"
|
|
}
|
|
|
|
[ "$magic_long" = "d00dfeed" ] && {
|
|
if ! linksys_is_factory_image "$1"; then
|
|
echo "factory image doesn't match device"
|
|
return 1
|
|
fi
|
|
|
|
echo "writing \"$1\" factory image to \"$part_label\""
|
|
get_image "$1" | mtd -e "$part_label" write - "$part_label"
|
|
}
|
|
}
|