diff options
| author | Jesse Gilles <jgilles@multitech.com> | 2011-08-10 14:28:41 -0500 |
|---|---|---|
| committer | Jesse Gilles <jgilles@multitech.com> | 2011-08-10 14:28:41 -0500 |
| commit | 450f8b4cf052d81101c3e8af6eea82498855a431 (patch) | |
| tree | e9e7b6b2c5ffeccd30f7e8e9d92b42cbc7feab86 | |
| parent | 0f419e2d6c350c6f482683d20e033ccd3447ad60 (diff) | |
initscripts: require /var/volatile/do_flash_upgrade before upgrading
| -rw-r--r-- | multitech/recipes/initscripts/initscripts-1.0/corecdp/umountfs | 11 | ||||
| -rw-r--r-- | multitech/recipes/initscripts/initscripts_1.0.bbappend | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/multitech/recipes/initscripts/initscripts-1.0/corecdp/umountfs b/multitech/recipes/initscripts/initscripts-1.0/corecdp/umountfs index ab3d709..871f538 100644 --- a/multitech/recipes/initscripts/initscripts-1.0/corecdp/umountfs +++ b/multitech/recipes/initscripts/initscripts-1.0/corecdp/umountfs @@ -78,8 +78,6 @@ flash_upgrade() { flash_eraseall ${uImage_mtd} nandwrite -p ${uImage_mtd} ${uImage_file} - - echo "Remember to clean-up ${uImage_file} after reboot" fi if [ -f ${rootfs_file} ]; then @@ -100,8 +98,6 @@ flash_upgrade() { flash_eraseall -j ${rootfs_mtd} ${flash_dir}/nandwrite.static ${rootfs_mtd} ${rootfs_file} - echo "Remember to clean-up ${flash_dir} after reboot" - echo "" echo "Rebooting..." ${flash_dir}/upgrade-reboot @@ -112,8 +108,11 @@ flash_upgrade() { fi } -flash_upgrade /var/volatile -flash_upgrade /media/card +# 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 +fi umount_all diff --git a/multitech/recipes/initscripts/initscripts_1.0.bbappend b/multitech/recipes/initscripts/initscripts_1.0.bbappend index bc4d4ac..3a98f61 100644 --- a/multitech/recipes/initscripts/initscripts_1.0.bbappend +++ b/multitech/recipes/initscripts/initscripts_1.0.bbappend @@ -1,2 +1,4 @@ FILESEXTRA := "${THISDIR}" FILESPATHBASE =. "${FILESEXTRA}:" + +PR .= ".corecdp1" |