diff options
| author | John Klug <john.klug@multitech.com> | 2017-06-09 10:22:39 -0500 |
|---|---|---|
| committer | John Klug <john.klug@multitech.com> | 2017-06-09 10:22:39 -0500 |
| commit | ca966936bec806fc5ed30b8af904a0e2398b7404 (patch) | |
| tree | b4757b38d4c53dd396972b969ab383785db70408 /recipes-core/initscripts/initscripts-1.0/umountfs | |
| parent | c23502dc821f6b7b17551e24d5287d8c8220fd26 (diff) | |
| parent | 140d44a8557acffbdda3d344c23a4e3481a3997a (diff) | |
| download | meta-mlinux-ca966936bec806fc5ed30b8af904a0e2398b7404.tar.gz meta-mlinux-ca966936bec806fc5ed30b8af904a0e2398b7404.tar.bz2 meta-mlinux-ca966936bec806fc5ed30b8af904a0e2398b7404.zip | |
Merge yocto-2.2 (morty) into master
Diffstat (limited to 'recipes-core/initscripts/initscripts-1.0/umountfs')
| -rw-r--r-- | recipes-core/initscripts/initscripts-1.0/umountfs | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/recipes-core/initscripts/initscripts-1.0/umountfs b/recipes-core/initscripts/initscripts-1.0/umountfs index 8c12ebe..bfd4d47 100644 --- a/recipes-core/initscripts/initscripts-1.0/umountfs +++ b/recipes-core/initscripts/initscripts-1.0/umountfs @@ -10,6 +10,7 @@ ### END INIT INFO PATH=/sbin:/bin:/usr/sbin:/usr/bin +upgrade_fname="/var/volatile/do_flash_upgrade" umount_all() { echo "Deactivating swap..." @@ -256,9 +257,13 @@ flash_upgrade() { } # do flash on reboot if do_flash_upgrade exists -if [ -f /var/volatile/do_flash_upgrade ]; then - flash_upgrade /var/volatile - flash_upgrade /media/card +# and is owned by root +if [[ -f ${upgrade_fname} ]] ; then + owner=$(stat -c%u "${upgrade_fname}") + if ((${#owner} > 0)) && ((owner == 0)) ; then + flash_upgrade /var/volatile + flash_upgrade /media/card + fi fi umount_all |