From c7a493cd051652ff3831c068bbe3274e3ae85166 Mon Sep 17 00:00:00 2001
From: p0isk <radio.86rk@gmail.com>
Date: Fri, 18 Feb 2022 21:19:50 +0300
Subject: [PATCH 1/2] Unload vendor specific modules during sysupgrade

---
 general/overlay/usr/sbin/sysupgrade | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/general/overlay/usr/sbin/sysupgrade b/general/overlay/usr/sbin/sysupgrade
index da749765..06b8e7fa 100755
--- a/general/overlay/usr/sbin/sysupgrade
+++ b/general/overlay/usr/sbin/sysupgrade
@@ -6,6 +6,7 @@
 set -e
 
 soc=$(fw_printenv -n soc) || (echo -e "\n\e[1;31mSOC not defined in U-Boot ENV...\e[0m\n"; exit 1)
+vendor=$(ipcinfo --vendor)
 kernel=$(awk -F ':' '/"kernel"/ {print $1}' /proc/mtd)
 rootfs=$(awk -F ':' '/"rootfs"/ {print $1}' /proc/mtd)
 overlay=$(awk -F ':' '/"rootfs_data"/ {print $1}' /proc/mtd)
@@ -21,6 +22,11 @@ stop_services() {
   killall crond klogd ntpd rngd syslogd || true
 }
 
+unload_modules() {
+  echo -e "\n\e[1;31mUnload vendor specific modules...\e[0m\n"
+  load_$vendor -r >/dev/null 2>&1
+}
+
 check_memory() {
   echo -e "\n\e[1;31mCheck RAM size...\e[0m\n"
   free
@@ -250,4 +256,5 @@ if [ $remotely -eq 1 ]; then
 fi
 
 stop_services
+unload_modules
 download_firmware "${url}" && check_memory && writing_kernel "${kernel_file}" && writing_rootfs "${rootfs_file}" && sleep 1 && clearing_overlayfs && quick_reboot

From 72186c2df81badb7a00844fb3eb3b4ed229ea53f Mon Sep 17 00:00:00 2001
From: p0isk <radio.86rk@gmail.com>
Date: Sat, 19 Feb 2022 18:44:56 +0300
Subject: [PATCH 2/2] Skip error while unload modules in sysupgrade

---
 general/overlay/usr/sbin/sysupgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/general/overlay/usr/sbin/sysupgrade b/general/overlay/usr/sbin/sysupgrade
index 06b8e7fa..f5e32e5d 100755
--- a/general/overlay/usr/sbin/sysupgrade
+++ b/general/overlay/usr/sbin/sysupgrade
@@ -24,7 +24,7 @@ stop_services() {
 
 unload_modules() {
   echo -e "\n\e[1;31mUnload vendor specific modules...\e[0m\n"
-  load_$vendor -r >/dev/null 2>&1
+  load_$vendor -r >/dev/null 2>&1 || true
 }
 
 check_memory() {