diff options
Diffstat (limited to 'meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-init.sh')
| -rw-r--r-- | meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-init.sh | 15 |
1 files changed, 10 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 89e4538ee..7953176d5 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 @@ -115,13 +115,18 @@ then debug_takeover "Debug initial shell requested by command line." fi -# If there are images in root move them to run/initramfs/ now. +# If there are images in root move them to /run/initramfs/ or /run/ now. imagebasename=${image##*/} -if test -n "${imagebasename}" -a "x$flash_images_before_init" = xy && - ls /${imagebasename}* > /dev/null 2>&1 +if test -n "${imagebasename}" && ls /${imagebasename}* > /dev/null 2>&1 then - echo "Pending flash updates found." - mv /${imagebasename}* ${image%$imagebasename} + if test "x$flash_images_before_init" = xy + then + echo "Flash images found, will update before starting init." + mv /${imagebasename}* ${image%$imagebasename} + else + echo "Flash images found, will use but deferring flash update." + mv /${imagebasename}* /run/ + fi fi if grep -w clean-rwfs-filesystem $optfile |
