summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilton Miller <miltonm@us.ibm.com>2016-05-23 18:35:21 -0500
committerMilton Miller <miltonm@us.ibm.com>2016-06-30 14:46:42 -0500
commit0f1edbefd47d9a0234b66e55a820a38cec01baa0 (patch)
tree727dc7a2eabbac638501c1091c078f42b0e95292
parent4d217806004f01aea08dfa82a6b7cc8b258d4c2e (diff)
downloadtalos-openbmc-0f1edbefd47d9a0234b66e55a820a38cec01baa0.tar.gz
talos-openbmc-0f1edbefd47d9a0234b66e55a820a38cec01baa0.zip
initfs: update: Do not cause an error if no files were saved
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@us.ibm.com>
-rwxr-xr-xmeta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-update.sh2
1 files changed, 1 insertions, 1 deletions
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 f8e551cfd..f0ca989d2 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/
OpenPOWER on IntegriCloud