Mirrors
/
aredn
mirror of https://github.com/aredn/aredn.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
aredn/patches/007-fix-sysupgrade-fail.patch

31 lines
942 B
Diff
Raw Normal View History

bugfix: Fix instance of sysupgrade failing It was discovered that sysupgrade would exit with an error when some processes could not be killed. The wifi interface is brought down to avoid this condition prior to doing the sysupgrade
2019-06-18 22:38:03 -06:00
From: Jeff Kletsky <git-commits@allycomm.com>
Wifi can, in certain situations, cause sysupgrade to fail silently
with a 256 return value as all processes can't be killed.
One of these situations is mesh with batman-adv active.
Added `wifi down` just prior to the killall sequence in stage2
Run-tested-on: Linksys EA8300
Signed-off-by: Jeff Kletsky <git-commits@allycomm.com>
---
package/base-files/files/lib/upgrade/stage2 | 4 ++++
1 file changed, 4 insertions(+)
Index: openwrt/package/base-files/files/lib/upgrade/stage2
===================================================================
--- openwrt.orig/package/base-files/files/lib/upgrade/stage2
+++ openwrt/package/base-files/files/lib/upgrade/stage2
aredn: upgrade to Openwrt 19.07.0 release Co-authored-by: Andrew KK4ZUZ <apcameron@softhome.net> This commit begins the process to migrate from ar71xx to ath79 target images.
2020-01-22 18:37:27 -07:00
@@ -123,6 +123,10 @@ kill_remaining KILL 1
sleep 1
bugfix: Fix instance of sysupgrade failing It was discovered that sysupgrade would exit with an error when some processes could not be killed. The wifi interface is brought down to avoid this condition prior to doing the sysupgrade
2019-06-18 22:38:03 -06:00
Improve the firmware upgrade process (#294) * Improve the firmware upgrade process The old firmware upgrade process attempted to free up RAM by reusing the 'upgrade_kill_prep' script which is later used by '/sbin/sysupgrade'. Unfortuantely this doesn't work as intented. While the script will go about killing various services, 'procd' just goes and starts them up again using quite a bit more memory in the process. Instead this script just kills the various daemons 'no questions asked' and then runs the associated '/etc/init.d/xxx stop' script to instruct 'procd' not the start them up again. This gets us to the place the original script was trying to go. + A syntax fix in '007' patch (need spaces around the [ .. ]) * Inline the style for the firmware page to avoid sleep before flash * Minor reliability improvements * Clear away services even earlier
2022-03-16 20:45:26 -06:00
+if [ -x "$(which wifi)" ]; then
bugfix: Fix instance of sysupgrade failing It was discovered that sysupgrade would exit with an error when some processes could not be killed. The wifi interface is brought down to avoid this condition prior to doing the sysupgrade
2019-06-18 22:38:03 -06:00
+ wifi down
+ sleep 1
+fi
aredn: upgrade to Openwrt 19.07.0 release Co-authored-by: Andrew KK4ZUZ <apcameron@softhome.net> This commit begins the process to migrate from ar71xx to ath79 target images.
2020-01-22 18:37:27 -07:00
if [ -n "$IMAGE" ] && type 'platform_pre_upgrade' >/dev/null 2>/dev/null; then
platform_pre_upgrade "$IMAGE"