summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Klug <john.klug@multitech.com>2021-05-28 05:00:10 -0500
committerJohn Klug <john.klug@multitech.com>2021-06-22 09:31:36 -0500
commitafef797f60615ce855cef2485519964b48cbf759 (patch)
treea21a6e8f393d7f5aede6b9c0a58bb30b5afdee03
parent044356fdb19eef79565c76d74441229809bbf111 (diff)
downloadmeta-mlinux-afef797f60615ce855cef2485519964b48cbf759.tar.gz
meta-mlinux-afef797f60615ce855cef2485519964b48cbf759.tar.bz2
meta-mlinux-afef797f60615ce855cef2485519964b48cbf759.zip
Flash upgrade fails from SD card
-rw-r--r--recipes-core/initscripts/initscripts-1.0/umountfs2
-rw-r--r--recipes-core/initscripts/initscripts_1.0.bbappend2
2 files changed, 3 insertions, 1 deletions
diff --git a/recipes-core/initscripts/initscripts-1.0/umountfs b/recipes-core/initscripts/initscripts-1.0/umountfs
index b044a4a..dd78a0e 100644
--- a/recipes-core/initscripts/initscripts-1.0/umountfs
+++ b/recipes-core/initscripts/initscripts-1.0/umountfs
@@ -265,6 +265,8 @@ flash_upgrade() {
return 1
fi
+ # Keep flash_root mounted
+ cd ${flash_root}
# Run the upgrade script, if it exists, before we change
# flash-root to read-only
if ((upgrade_script == 1)) ; then
diff --git a/recipes-core/initscripts/initscripts_1.0.bbappend b/recipes-core/initscripts/initscripts_1.0.bbappend
index 537fbee..6e0e9f3 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 .= ".46"
+PR .= ".47"