diff options
| author | John Klug <john.klug@multitech.com> | 2020-08-26 15:03:07 -0500 |
|---|---|---|
| committer | John Klug <john.klug@multitech.com> | 2020-08-26 15:03:07 -0500 |
| commit | de827905477b17040d5d819b6defa63a04659d9d (patch) | |
| tree | ffbf7384d976b8efe41d26c60d18db827f99a13f | |
| parent | dfeafb716c4453b3f7a8ef35f41bbccde7a1806a (diff) | |
| download | meta-mlinux-de827905477b17040d5d819b6defa63a04659d9d.tar.gz meta-mlinux-de827905477b17040d5d819b6defa63a04659d9d.tar.bz2 meta-mlinux-de827905477b17040d5d819b6defa63a04659d9d.zip | |
Account for the noexec flag when doing a script-based upgrade.
| -rw-r--r-- | recipes-core/initscripts/initscripts-1.0/umountfs | 3 | ||||
| -rw-r--r-- | recipes-core/initscripts/initscripts_1.0.bbappend | 2 |
2 files changed, 4 insertions, 1 deletions
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" |