From 16ebb7cec387bcbbe9b7e508616d35166ba10b75 Mon Sep 17 00:00:00 2001 From: Paul White Date: Fri, 26 Jan 2024 00:47:13 +0000 Subject: [PATCH] eap-104: fix dualboot: reset bootcount The bootcount wasn't getting reset to 0 upon a successful boot, resulting in falling back to the previous firmware version after three reboots of the AP. Fixes: WIFI-13359 Signed-off-by: Paul White --- feeds/ipq807x/ipq807x/base-files/etc/init.d/bootcount | 3 ++- feeds/ipq807x_v5.4/ipq60xx/base-files/etc/init.d/bootcount | 3 ++- feeds/ipq807x_v5.4/ipq807x/base-files/etc/init.d/bootcount | 3 ++- feeds/tip/certificates/files/usr/bin/mount_certs | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/feeds/ipq807x/ipq807x/base-files/etc/init.d/bootcount b/feeds/ipq807x/ipq807x/base-files/etc/init.d/bootcount index 0a545d14b..3867ad463 100755 --- a/feeds/ipq807x/ipq807x/base-files/etc/init.d/bootcount +++ b/feeds/ipq807x/ipq807x/base-files/etc/init.d/bootcount @@ -16,7 +16,8 @@ boot() { ;; edgecore,eap101|\ edgecore,eap102|\ - edgecore,oap102) + edgecore,oap102|\ + edgecore.eap104) avail=$(fw_printenv -n upgrade_available) [ "${avail}" -eq 1 ] || fw_setenv upgrade_available 1 fw_setenv bootcount 0 diff --git a/feeds/ipq807x_v5.4/ipq60xx/base-files/etc/init.d/bootcount b/feeds/ipq807x_v5.4/ipq60xx/base-files/etc/init.d/bootcount index c93c30060..b0f1f03bb 100755 --- a/feeds/ipq807x_v5.4/ipq60xx/base-files/etc/init.d/bootcount +++ b/feeds/ipq807x_v5.4/ipq60xx/base-files/etc/init.d/bootcount @@ -10,7 +10,8 @@ boot() { ;; edgecore,eap101|\ edgecore,eap102|\ - edgecore,oap102) + edgecore,oap102|\ + edgecore.eap104) avail=$(fw_printenv -n upgrade_available) [ ${avail} -eq 0 ] && fw_setenv upgrade_available 1 fw_setenv bootcount 0 diff --git a/feeds/ipq807x_v5.4/ipq807x/base-files/etc/init.d/bootcount b/feeds/ipq807x_v5.4/ipq807x/base-files/etc/init.d/bootcount index c93c30060..b0f1f03bb 100755 --- a/feeds/ipq807x_v5.4/ipq807x/base-files/etc/init.d/bootcount +++ b/feeds/ipq807x_v5.4/ipq807x/base-files/etc/init.d/bootcount @@ -10,7 +10,8 @@ boot() { ;; edgecore,eap101|\ edgecore,eap102|\ - edgecore,oap102) + edgecore,oap102|\ + edgecore.eap104) avail=$(fw_printenv -n upgrade_available) [ ${avail} -eq 0 ] && fw_setenv upgrade_available 1 fw_setenv bootcount 0 diff --git a/feeds/tip/certificates/files/usr/bin/mount_certs b/feeds/tip/certificates/files/usr/bin/mount_certs index 56d1c0ab6..a1cac22d1 100755 --- a/feeds/tip/certificates/files/usr/bin/mount_certs +++ b/feeds/tip/certificates/files/usr/bin/mount_certs @@ -44,7 +44,7 @@ actiontec,web7200) edgecore,ecw5211|\ edgecore,eap101|\ edgecore,eap102|\ -edgecore,oap102) +edgecore,oap104) if grep -q rootfs1 /proc/cmdline; then PART_NAME=rootfs2 else