From: Changqing Li <changqing...@windriver.com>
* default volatiles file is for VOLATILE_TMP_DIR=yes, and
VOLATILE_LOG_DIR=yes, if they set to no, remove volatile related config
* replace /var/volatile/tmp with /var/tmp for populate-volatile.sh
Signed-off-by: Changqing Li <changqing...@windriver.com>
---
.../initscripts/initscripts-1.0/volatiles | 1 +
meta/recipes-core/initscripts/initscripts_1.0.bb | 12 +++++++-----
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/volatiles
b/meta/recipes-core/initscripts/initscripts-1.0/volatiles
index cd8a4be05f..a280c47dda 100644
--- a/meta/recipes-core/initscripts/initscripts-1.0/volatiles
+++ b/meta/recipes-core/initscripts/initscripts-1.0/volatiles
@@ -28,6 +28,7 @@ d root root 0755 /var/volatile/log none
d root root 1777 /var/volatile/tmp none
l root root 1777 /var/lock /run/lock
l root root 0755 /var/run /run
+l root root 0755 /var/log /var/volatile/log
l root root 1777 /var/tmp /var/volatile/tmp
l root root 1777 /tmp /var/tmp
d root root 0755 /var/lock/subsys none
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb
b/meta/recipes-core/initscripts/initscripts_1.0.bb
index 4b34c6a67f..c2eff7e02f 100644
--- a/meta/recipes-core/initscripts/initscripts_1.0.bb
+++ b/meta/recipes-core/initscripts/initscripts_1.0.bb
@@ -103,12 +103,14 @@ do_install () {
install -m 0755 ${WORKDIR}/read-only-rootfs-hook.sh
${D}${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/save-rtc.sh ${D}${sysconfdir}/init.d
install -m 0644 ${WORKDIR}/volatiles
${D}${sysconfdir}/default/volatiles/00_core
- if [ ${@ oe.types.boolean('${VOLATILE_LOG_DIR}') } = True ]; then
- sed -i -e '\@^d root root 0755 /var/volatile/log none$@ a\l
root root 0755 /var/log /var/volatile/log' \
- ${D}${sysconfdir}/default/volatiles/00_core
+ if [ ${@ oe.types.boolean('${VOLATILE_LOG_DIR}') } = False ]; then
+ sed -i -e '/^[d|l].*\/var\/volatile\/log/d'
${D}${sysconfdir}/default/volatiles/00_core
fi
- if [ "${VOLATILE_TMP_DIR}" != "yes" ]; then
- sed -i -e "/\<tmp\>/d"
${D}${sysconfdir}/default/volatiles/00_core
+ if [ ${@ oe.types.boolean('${VOLATILE_TMP_DIR}') } = False ]; then
+ sed -i -e "/^[d|l].*\/var\/volatile\/tmp/d"
${D}${sysconfdir}/default/volatiles/00_core
+ sed -i -e "/^l.*\/tmp/d"
${D}${sysconfdir}/default/volatiles/00_core
+ sed -i -e
's;TMPROOT="${ROOT_DIR}/var/volatile/tmp";TMPROOT="${ROOT_DIR}/var/tmp";g' \
+ ${D}${sysconfdir}/init.d/populate-volatile.sh
fi
install -m 0755 ${WORKDIR}/dmesg.sh ${D}${sysconfdir}/init.d
install -m 0644 ${WORKDIR}/logrotate-dmesg.conf ${D}${sysconfdir}/
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192025):
https://lists.openembedded.org/g/openembedded-core/message/192025
Mute This Topic: https://lists.openembedded.org/mt/103052520/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
