[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7256/8267] initscripts: support persistent /var/log

[Emmanuele Bassi <ebassi src gnome org>]

commit 8c69b6ab8573ff5308c93691599f13810d338755
Author: Chen Qi <Qi Chen windriver com>
Date:   Wed Aug 16 19:57:17 2017 +0800

    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>

 .../initscripts/initscripts-1.0/volatiles          |    1 -
 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 bc17c45..2011066 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
 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 a65f1b2..7ab0d2b 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}/