summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilton D. Miller II <miltonm@us.ibm.com>2016-02-28 15:54:53 -0600
committerMilton D. Miller II <miltonm@us.ibm.com>2016-03-04 10:51:01 -0600
commit517f9d7f4e245769fcdaac995168daee8f0b3cd6 (patch)
tree84066cf62182d02eeb0557368290dc54fada611f
parentecf68d582580c2582ad7b2fe1c03b8b529abc788 (diff)
downloadtalos-openbmc-517f9d7f4e245769fcdaac995168daee8f0b3cd6.tar.gz
talos-openbmc-517f9d7f4e245769fcdaac995168daee8f0b3cd6.zip
update: Do not check if the whitelist is empty
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@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 dff23d50d..f40a54692 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
OpenPOWER on IntegriCloud