From 0328295ea8717d0b5c4451c94b820056762090cf Mon Sep 17 00:00:00 2001
From: Francisco Gil <francisco.gilmartinez@digi.com>
Date: Thu, 17 Nov 2022 17:08:50 +0100
Subject: [PATCH] dualboot: run the script only in dualboot systems

Signed-off-by: Francisco Gil <francisco.gilmartinez@digi.com>
---
 .../dualboot/dualboot/dualboot-init           | 40 ++++++++++---------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/meta-digi-dey/recipes-digi/dualboot/dualboot/dualboot-init b/meta-digi-dey/recipes-digi/dualboot/dualboot/dualboot-init
index d134b01e7..8ede937ab 100644
--- a/meta-digi-dey/recipes-digi/dualboot/dualboot/dualboot-init
+++ b/meta-digi-dey/recipes-digi/dualboot/dualboot/dualboot-init
@@ -14,35 +14,37 @@
 #===============================================================================
 
 dualboot_init () {
-	ACTIVE_SYSTEM="$(fw_printenv -n active_system 2>/dev/null)"
-	if [ -z "${ACTIVE_SYSTEM}" ]; then
-		if grep -qs environment /proc/mtd; then
-			MTD_BOOT_PART="$(fw_printenv -n mtdbootpart 2>/dev/null)"
-			fw_setenv active_system "${MTD_BOOT_PART}"
-		else
-			BOOT_PART="$(fw_printenv -n mmcpart 2>/dev/null)"
-			BOOT_DEV="$(fw_printenv -n mmcbootdev 2>/dev/null)"
-			CURRENT_PART="$(ls -l /dev/disk/by-partlabel/ | grep -i mmcblk${BOOT_DEV}p${BOOT_PART} | awk '{print $9}')"
-			fw_setenv active_system "${CURRENT_PART}"
+	if [ "$(fw_printenv -n dualboot 2>/dev/null)" = "yes" ]; then
+		echo -n "Starting dualboot check: "
+		ACTIVE_SYSTEM="$(fw_printenv -n active_system 2>/dev/null)"
+		if [ -z "${ACTIVE_SYSTEM}" ]; then
+			if grep -qs environment /proc/mtd; then
+				MTD_BOOT_PART="$(fw_printenv -n mtdbootpart 2>/dev/null)"
+				fw_setenv active_system "${MTD_BOOT_PART}"
+			else
+				BOOT_PART="$(fw_printenv -n mmcpart 2>/dev/null)"
+				BOOT_DEV="$(fw_printenv -n mmcbootdev 2>/dev/null)"
+				CURRENT_PART="$(sed -ne 's,PARTNAME=,,g;T;p' /sys/class/block/mmcblk"${BOOT_DEV}"p"${BOOT_PART}"/uevent)"
+				fw_setenv active_system "${CURRENT_PART}"
+			fi
 		fi
-	fi
 
-	ISUPGRADING="$(fw_printenv -n upgrade_available 2>/dev/null)"
+		ISUPGRADING="$(fw_printenv -n upgrade_available 2>/dev/null)"
 
-	if [ "$ISUPGRADING" = "1" ]; then
-		BOOTCOUNT="$(fw_printenv -n bootcount 2>/dev/null)"
-		if [ "${BOOTCOUNT}" -lt 3 ]; then
-			fw_setenv upgrade_available
-			fw_setenv bootcount 0
+		if [ "$ISUPGRADING" = "1" ]; then
+			BOOTCOUNT="$(fw_printenv -n bootcount 2>/dev/null)"
+			if [ "${BOOTCOUNT}" -lt 3 ]; then
+				fw_setenv upgrade_available
+				fw_setenv bootcount 0
+			fi
 		fi
+		echo "done."
 	fi
 }
 
 case "$1" in
 	start)
-		echo -n "Starting dualboot check: "
 		dualboot_init
-		echo "done."
 		;;
 	stop)
 		;;