summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2017-08-16 19:57:17 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-18 10:40:26 +0100
commit8c69b6ab8573ff5308c93691599f13810d338755 (patch)
tree2d36c5dc2a67083e57d4d1edf7b08977ab436b14 /meta
parenta2ec15f20c10ea42a5f6247dafc1d0ffbab68a22 (diff)
downloadpoky-8c69b6ab8573ff5308c93691599f13810d338755.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] (From OE-Core rev: 50914c4a84e0fb6b9bf6bb1864a2d653218753ce) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/initscripts/initscripts-1.0/volatiles1
-rw-r--r--meta/recipes-core/initscripts/initscripts_1.0.bb3
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 bc17c4553d..201106645d 100644
--- a/meta/recipes-core/initscripts/initscripts-1.0/volatiles
+++ b/meta/recipes-core/initscripts/initscripts-1.0/volatiles
@@ -27,7 +27,6 @@ d root root 1777 /run/lock none
27d root root 0755 /var/volatile/log none 27d root root 0755 /var/volatile/log none
28d root root 1777 /var/volatile/tmp none 28d root root 1777 /var/volatile/tmp none
29l root root 1777 /var/lock /run/lock 29l root root 1777 /var/lock /run/lock
30l root root 0755 /var/log /var/volatile/log
31l root root 0755 /var/run /run 30l root root 0755 /var/run /run
32l root root 1777 /var/tmp /var/volatile/tmp 31l root root 1777 /var/tmp /var/volatile/tmp
33l root root 1777 /tmp /var/tmp 32l 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 a65f1b24a5..7ab0d2bd41 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 () {
102 install -m 0755 ${WORKDIR}/read-only-rootfs-hook.sh ${D}${sysconfdir}/init.d 102 install -m 0755 ${WORKDIR}/read-only-rootfs-hook.sh ${D}${sysconfdir}/init.d
103 install -m 0755 ${WORKDIR}/save-rtc.sh ${D}${sysconfdir}/init.d 103 install -m 0755 ${WORKDIR}/save-rtc.sh ${D}${sysconfdir}/init.d
104 install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/00_core 104 install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/00_core
105 if [ ${@ oe.types.boolean('${VOLATILE_LOG_DIR}') } = True ]; then
106 echo "l root root 0755 /var/log /var/volatile/log" >> ${D}${sysconfdir}/default/volatiles/00_core
107 fi
105 install -m 0755 ${WORKDIR}/dmesg.sh ${D}${sysconfdir}/init.d 108 install -m 0755 ${WORKDIR}/dmesg.sh ${D}${sysconfdir}/init.d
106 install -m 0644 ${WORKDIR}/logrotate-dmesg.conf ${D}${sysconfdir}/ 109 install -m 0644 ${WORKDIR}/logrotate-dmesg.conf ${D}${sysconfdir}/
107 110