[PATCH openbmc v6 16/18] initfs: update: handle no images to update
OpenBMC Patches
openbmc-patches at stwcx.xyz
Thu Jun 23 10:30:36 AEST 2016
From: Milton Miller <miltonm at us.ibm.com>
Notify the user if image wildcard expansion fails instead of printing
message about failing to find partition to flash.
The update script errors with the message that it can't figure out what
partition to flash for /run/initramfs/image-* if there are no images
pending.
Signed-off-by: Milton Miller <miltonm at us.ibm.com>
---
.../obmc-phosphor-initfs/files/obmc-update.sh | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 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 1dbf65f..7120a18 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
@@ -99,6 +99,7 @@ checkmount=y
whitelist=/run/initramfs/whitelist
image=/run/initramfs/image-
E="ERROR:"
+imglist=
while test "$1" != "${1#-}"
do
@@ -184,7 +185,15 @@ then
fi
fi
-for f in $image*
+imglist=$(echo $image*)
+if test "$imglist" = "$image*" -a ! -e "$imglist"
+then
+ # shell didn't expand the wildcard, so no files exist
+ echo "No images found to update."
+ imglist=
+fi
+
+for f in $imglist
do
m=$(findmtd ${f#$image})
if test -z "$m"
@@ -209,7 +218,7 @@ done
if test -n "$doflash"
then
- for f in $image*
+ for f in $imglist
do
if test ! -s $f
then
--
2.9.0
More information about the openbmc
mailing list