From 7b242188a17ec9f7bc626c0685b2d7f486564b66 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Wed, 26 Aug 2020 15:03:07 -0500
Subject: Account for the noexec flag when doing a script-based upgrade.

---
 recipes-core/initscripts/initscripts-1.0/umountfs | 3 +++
 recipes-core/initscripts/initscripts_1.0.bbappend | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/recipes-core/initscripts/initscripts-1.0/umountfs b/recipes-core/initscripts/initscripts-1.0/umountfs
index 9c36bd3..b100086 100644
--- a/recipes-core/initscripts/initscripts-1.0/umountfs
+++ b/recipes-core/initscripts/initscripts-1.0/umountfs
@@ -251,6 +251,9 @@ flash_upgrade() {
   # flash-root to read-only
   if ((upgrade_script == 1)) ; then
       if (cd ${flash_dir};tar -xf ${upgrade_file}) ; then
+          if ! [[ -x ${flash_dir}/${install_file} ]]
+              /bin/mount -o remount,exec ${flash_root}
+          fi
           exec ${flash_dir}/${install_file} ${flash_root}
       else
 	  echo "Extraction of ${upgrade_file} failed"
diff --git a/recipes-core/initscripts/initscripts_1.0.bbappend b/recipes-core/initscripts/initscripts_1.0.bbappend
index af7b258..c5bd486 100644
--- a/recipes-core/initscripts/initscripts_1.0.bbappend
+++ b/recipes-core/initscripts/initscripts_1.0.bbappend
@@ -3,4 +3,4 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
 # flash on reboot/umountfs needs regular umount (not busybox)
 RDEPENDS_${PN} += "util-linux-umount util-linux-mount bash"
 
-PR .= ".43"
+PR .= ".44"
-- 
cgit v1.2.3