From 24277e412c93ecfa2649ecefe25bf66d4ab3b942 Mon Sep 17 00:00:00 2001
From: viktorxda <35473052+viktorxda@users.noreply.github.com>
Date: Mon, 9 Oct 2023 20:33:22 +0200
Subject: [PATCH] [no ci] Overlay: update sysupgrade nand detection (#1027)
---
general/overlay/usr/sbin/sysupgrade | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/general/overlay/usr/sbin/sysupgrade b/general/overlay/usr/sbin/sysupgrade
index 97ce1ecd..1b602082 100755
--- a/general/overlay/usr/sbin/sysupgrade
+++ b/general/overlay/usr/sbin/sysupgrade
@@ -1,9 +1,9 @@
#!/bin/sh
#
-# OpenIPC.org | v.20230520
+# OpenIPC.org | v.20231008
#
-scr_version=1.0.20
+scr_version=1.0.21
args=" $@"
@@ -79,7 +79,7 @@ do_update_rootfs() {
do_wipe_overlay() {
echo_c 33 "\nOverlayFS"
echo "Erase overlay partition"
- [ $(get_flash_type mtd) = "nand" ] || jffs2="-j"
+ [ "$flash_type" = "nand" ] || jffs2="-j"
busybox flash_eraseall $jffs2 "$(get_device "rootfs_data")"
}
@@ -87,7 +87,7 @@ download_firmware() {
echo_c 33 "\nFirmware"
[ "$branch_dev" = "1" ] && branch="dev" || branch="latest"
osr=$(get_system_build)
- ftype=$(get_flash_type)
+ ftype="nor"
build="${soc}-${ftype}-${osr}"
[ -z "$url" ] && url="https://github.com/OpenIPC/firmware/releases/download/${branch}/openipc.${build}.tgz"
echo "Download from $url"
@@ -198,6 +198,7 @@ get_system_info() {
kernel_device=$(get_device "kernel")
kernel_version=$(get_kernel_version "$kernel_device")
system_version=$(get_system_version "")
+ flash_type=$(${IPCINFO} -F)
}
get_system_version() {
@@ -208,12 +209,6 @@ get_system_build() {
grep "BUILD_OPTION" "/etc/os-release" | head -1 | cut -d= -f2
}
-get_flash_type() {
- local x=$(${IPCINFO} -F)
- [ -z "$1" ] && [ "$x" = "nand" ] && $(fw_printenv bootcmd | grep -qv nand) && x=nor
- echo "$x"
-}
-
print_sysinfo() {
get_system_info
echo_c 33 "OpenIPC System Updater v${scr_version}"