diff options
| author | Milton D. Miller II <miltonm@us.ibm.com> | 2016-02-29 11:23:35 -0600 |
|---|---|---|
| committer | Milton D. Miller II <miltonm@us.ibm.com> | 2016-03-07 15:20:15 -0600 |
| commit | 2f3b0a4db074a3059d8b638c39e18d526fb30a4a (patch) | |
| tree | df082a077bd4eed9ec3ed814315673b81327511f | |
| parent | 9ecec17136be5662cf92046ece5c235e370eb57e (diff) | |
| download | talos-openbmc-2f3b0a4db074a3059d8b638c39e18d526fb30a4a.tar.gz talos-openbmc-2f3b0a4db074a3059d8b638c39e18d526fb30a4a.zip | |
init: Be explicit about saving and restoring files.
When calling update for save and restore phases be explicitly tell
update to clean saved files when we are done and not bother trying
to save or restore when we know we will do a split save, erase, and
restore sequence.
Signed-off-by: Milton Miller <miltonm@us.ibm.com>
| -rw-r--r-- | meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-init.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-init.sh b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-init.sh index f6a6b7b61..469beaff7 100644 --- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-init.sh +++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-init.sh @@ -149,15 +149,14 @@ then elif test -f $trigger -a ! -s $trigger then echo "Saving selected files from read-write overlay filesystem." - /update && rm -f $image* + /update --no-restore-files echo "Clearing read-write overlay filesystem." flash_eraseall /dev/$rwfs echo "Restoring saved files to read-write overlay filesystem." touch $trigger - /update - rm -rf /save $trigger + /update --no-save-files --clean-saved-files else - /update && rm -f $image* + /update --clean-saved-files fi rwfst=$(probe_fs_type $rwdev) |
