[PATCH openbmc v6 08/18] initfs: update: Do not cause an error if no files were saved

[Andrew Jeffery]

On Wed, 2016-06-22 at 19:30 -0500, OpenBMC Patches wrote:
> From: "Milton D. Miller II" <miltonm at us.ibm.com>
> 
> If there were no files in the read-write overlay file system that
> were in the persistent file list, then the save directory will
> not be created and therefore not exist.  Skip attempting copying
> the non-existent directory in that case to avoid the error message.
> 
> Signed-off-by: Milton Miller <miltonm at us.ibm.com>
> ---
>  .../common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-update.sh   | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-update.sh b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-update.sh
> index f8e551c..f0ca989 100755
> --- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-update.sh
> +++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-update.sh
> @@ -144,7 +144,7 @@ do
>  	flashcp -v $f /dev/$m && rm $f
>  done
>  
> -if test "x$toram" = xy
> +if test -d $save -a "x$toram" = xy
>  then
>  	mkdir -p $upper
>  	cp -rp $save/. $upper/

Reviewed-by: Andrew Jeffery <andrew at aj.id.au>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: This is a digitally signed message part
URL: <http://lists.ozlabs.org/pipermail/openbmc/attachments/20160623/551afd04/attachment.sig>