From cd156bbec80ec352144758b660ab97eef97e7322 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Wed, 17 Nov 2021 13:14:51 -0600
Subject: Extract do_flash_upgrade from tarfile in factory reset case

---
 .../mlinux-scripts/mlinux-scripts/mlinux-firmware-upgrade        | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/recipes-core/mlinux-scripts/mlinux-scripts/mlinux-firmware-upgrade b/recipes-core/mlinux-scripts/mlinux-scripts/mlinux-firmware-upgrade
index 7f02038..568ddcc 100755
--- a/recipes-core/mlinux-scripts/mlinux-scripts/mlinux-firmware-upgrade
+++ b/recipes-core/mlinux-scripts/mlinux-scripts/mlinux-firmware-upgrade
@@ -95,8 +95,13 @@ if (( $tobeflashed )); then
         done
     fi
     mkdir -p /var/volatile/flash-upgrade
-    mv -f $upgrade /var/volatile/flash-upgrade/upgrade.bin
-    echo "$dofactoryreset" >"${dofile}"
+    newbinfile=/var/volatile/flash-upgrade/upgrade.bin
+    mv -f $upgrade $newbinfile
+    if ((dofactoryreset == 1)) ; then
+        tar -xO -f "${newbinfile}" do_flash_upgrade >"$dofile"
+    else
+        touch "$dofile"
+    fi
     chown "root:root" "${dofile}" || true
     uid=$(stat -c %u "${dofile}") || true
     result=$?
-- 
cgit v1.2.3