[PATCH openbmc v2 09/34] update: Do not check if the whitelist is empty

OpenBMC Patches openbmc-patches at stwcx.xyz
Tue Mar 8 08:29:58 AEDT 2016


From: "Milton D. Miller II" <miltonm at us.ibm.com>

Let the copy loop execute zero times instead of checking if
the whitelist is empty.

Suppressing the mount and copying the files can be achieved via
command line options.  This removes a condition and prepares for
splitting the whitelist into component files with support for
commented out lines.

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 dff23d5..f40a546 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
@@ -90,7 +90,7 @@ do
 	esac
 done
 
-if test "x$dosave" = xy -a -n "$rwfs" -a -s whitelist
+if test "x$dosave" = xy -a -n "$rwfs"
 then
 	mkdir -p $rwdir
 	mount $rwdev $rwdir -t $(probe_fs_type $rwdev) -o $rorwopts
-- 
2.7.1




More information about the openbmc mailing list