diff options
3 files changed, 8 insertions, 5 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-init.sh b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-init.sh index 70af93d991..1f54d392f1 100644 --- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-init.sh +++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-init.sh @@ -18,7 +18,7 @@ fi mkdir -p $rodir $rwdir -cp -rp init shutdown update whitelist bin sbin usr lib etc var run/initramfs +cp -rp init shutdown update whitelist.d bin sbin usr lib etc var run/initramfs # To start a interactive shell with job control at this point, run # getty 38400 ttyS4 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 f0c41a74c0..b061e262fc 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 @@ -100,7 +100,7 @@ toram= checksize=y checkmount=y -whitelist=/run/initramfs/whitelist +whitelist=/run/initramfs/whitelist.d/ image=/run/initramfs/image- imglist= @@ -191,7 +191,9 @@ then done mkdir -p "${d%/*}" cp -rp "$upper/$f" "${d%/*}/" - done < $whitelist + done << HERE +$(grep -v ^# $whitelist*) +HERE if test -n "$mounted" then diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/obmc-phosphor-initfs.bb b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/obmc-phosphor-initfs.bb index f81e21dd12..70b6686999 100644 --- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/obmc-phosphor-initfs.bb +++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/obmc-phosphor-initfs.bb @@ -21,10 +21,11 @@ do_install() { install -m 0755 ${WORKDIR}/obmc-init.sh ${D}/init install -m 0755 ${WORKDIR}/obmc-shutdown.sh ${D}/shutdown install -m 0755 ${WORKDIR}/obmc-update.sh ${D}/update - install -m 0644 ${WORKDIR}/whitelist ${D}/whitelist + install -d ${D}/whitelist.d + install -m 0644 ${WORKDIR}/whitelist ${D}/whitelist.d/whitelist install -d ${D}/dev mknod -m 622 ${D}/dev/console c 5 1 } -FILES_${PN} += " /init /shutdown /update /whitelist /dev " +FILES_${PN} += " /init /shutdown /update /whitelist.d/whitelist /dev " FILES_${PN} += " /init-options /init-download-url " |