[PATCH openbmc 1/3] update: look for whitelist in directory with images

OpenBMC Patches openbmc-patches at stwcx.xyz
Tue Feb 16 11:30:20 AEDT 2016


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

Like the images, the whitelist should be found under /run/initramfs/.

Use variable whitelist to hold this path.

Signed-off-by: Milton Miller <miltonm at us.ibm.com>
---
 .../recipes-phosphor/obmc-phosphor-initfs/files/obmc-update.sh       | 5 +++--
 1 file changed, 3 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 face06d..70188ad 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
@@ -45,8 +45,9 @@ rorwopts=ro${rwopts#rw}
 rwdir=rw
 upper=$rwdir/cow
 save=save/${upper##*/}
+whitelist=/run/initramfs/whitelist
 
-if test -n "$rwfs" && test -s whitelist
+if test -n "$rwfs" && test -s $whitelist
 then
 
 	mkdir -p $rwdir
@@ -61,7 +62,7 @@ then
 		d="$save/$f"
 		mkdir -p "${d%/*}"
 		cp -rp $upper/$f "${d%/*}/"
-	done < whitelist
+	done < $whitelist
 
 	umount $rwdir
 fi
-- 
2.7.1




More information about the openbmc mailing list