diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2016-11-22 15:40:29 +0800 |
---|---|---|
committer | Chen Qi <Qi.Chen@windriver.com> | 2016-12-14 17:04:19 +0800 |
commit | a1b8a0d9776f995e83b85ac82b14e2592698de7d (patch) | |
tree | 7fb80147f3d25af2539ea81762ab65e975d94fe6 /meta | |
parent | 432f9a5147f555f2126976856cbbcfdaf2ae1385 (diff) | |
download | openembedded-core-contrib-a1b8a0d9776f995e83b85ac82b14e2592698de7d.tar.gz |
initscripts: support persistent /var/log
Respect VOLATILE_VAR_LOG variable so that if it's set to any valid boolean
false value, we could have persistent /var/log on the final image.
[YOCTO #6132]
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/initscripts/initscripts-1.0/volatiles | 1 | ||||
-rw-r--r-- | meta/recipes-core/initscripts/initscripts_1.0.bb | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/volatiles b/meta/recipes-core/initscripts/initscripts-1.0/volatiles index 297245d0e4..6cccab74ab 100644 --- a/meta/recipes-core/initscripts/initscripts-1.0/volatiles +++ b/meta/recipes-core/initscripts/initscripts-1.0/volatiles @@ -25,7 +25,6 @@ d root root 1777 /run/lock none 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/log /var/volatile/log l root root 0755 /var/run /run l root root 1777 /var/tmp /var/volatile/tmp l root root 1777 /tmp /var/tmp diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb index 8f110b0050..453116c13d 100644 --- a/meta/recipes-core/initscripts/initscripts_1.0.bb +++ b/meta/recipes-core/initscripts/initscripts_1.0.bb @@ -102,6 +102,9 @@ 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 + echo "l root root 0755 /var/log /var/volatile/log" >> ${D}${sysconfdir}/default/volatiles/00_core + fi install -m 0755 ${WORKDIR}/dmesg.sh ${D}${sysconfdir}/init.d install -m 0644 ${WORKDIR}/logrotate-dmesg.conf ${D}${sysconfdir}/ |