diff options
| author | Milton D. Miller II <miltonm@us.ibm.com> | 2016-02-29 11:35:14 -0600 |
|---|---|---|
| committer | Milton D. Miller II <miltonm@us.ibm.com> | 2016-03-07 15:20:17 -0600 |
| commit | 383bfc7b1fd06f583b40f96bd4c9aa09faacc4b9 (patch) | |
| tree | b1c5ba433ac8b22837a66b459ba9db68eb35825b | |
| parent | 2f3b0a4db074a3059d8b638c39e18d526fb30a4a (diff) | |
| download | talos-openbmc-383bfc7b1fd06f583b40f96bd4c9aa09faacc4b9.tar.gz talos-openbmc-383bfc7b1fd06f583b40f96bd4c9aa09faacc4b9.zip | |
init: Call update from initramfs directory
Use the copy in /run/initramfs/update to call update to be consistent
with other uses.
Signed-off-by: Milton Miller <miltonm@us.ibm.com>
| -rw-r--r-- | meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-init.sh | 11 |
1 files changed, 6 insertions, 5 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 469beaff7..b4d156945 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 @@ -102,6 +102,7 @@ fsckbase=/sbin/fsck. fsck=$fsckbase$rwfst fsckopts=-a optfile=/run/initramfs/init-options +update=/run/initramfs/update if test ! -f $optfile then @@ -143,20 +144,20 @@ fi if ls $image* > /dev/null 2>&1 then - if ! test -x /update + if ! test -x $update then - debug_takeover "Flash update requested but /update missing!" + debug_takeover "Flash update requested but $update missing!" elif test -f $trigger -a ! -s $trigger then echo "Saving selected files from read-write overlay filesystem." - /update --no-restore-files + $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 --no-save-files --clean-saved-files + $update --no-save-files --clean-saved-files else - /update --clean-saved-files + $update --clean-saved-files fi rwfst=$(probe_fs_type $rwdev) |
