summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorMatthias Schiffer <matthias.schiffer@ew.tq-group.com>2021-07-21 16:10:16 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-24 16:33:46 +0100
commit7edb25bc99f4a098c34bc461c2e859e6f69195a1 (patch)
treee64d897bbc5209c7b80ed281850021e9ba6484ed /meta/recipes-core
parent2b45c7253fde3edf97e73e433f4d73989997a87a (diff)
downloadpoky-7edb25bc99f4a098c34bc461c2e859e6f69195a1.tar.gz
initscripts: fix creation order for /var/log with VOLATILE_LOG_DIR=true
Create the /var/log symlink directly after /var/volatile/log, so /var/log is available for the creation of /var/log/wtmp a few lines later. (From OE-Core rev: 64b659b9e40da3280ba8911b4044b19aa7366262) Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/initscripts/initscripts_1.0.bb3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb
index 5e994f2b7f..65f9c0ae8d 100644
--- a/meta/recipes-core/initscripts/initscripts_1.0.bb
+++ b/meta/recipes-core/initscripts/initscripts_1.0.bb
@@ -106,7 +106,8 @@ do_install () {
106 install -m 0755 ${WORKDIR}/save-rtc.sh ${D}${sysconfdir}/init.d 106 install -m 0755 ${WORKDIR}/save-rtc.sh ${D}${sysconfdir}/init.d
107 install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/00_core 107 install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/00_core
108 if [ ${@ oe.types.boolean('${VOLATILE_LOG_DIR}') } = True ]; then 108 if [ ${@ oe.types.boolean('${VOLATILE_LOG_DIR}') } = True ]; then
109 echo "l root root 0755 /var/log /var/volatile/log" >> ${D}${sysconfdir}/default/volatiles/00_core 109 sed -i -e '\@^d root root 0755 /var/volatile/log none$@ a\l root root 0755 /var/log /var/volatile/log' \
110 ${D}${sysconfdir}/default/volatiles/00_core
110 fi 111 fi
111 install -m 0755 ${WORKDIR}/dmesg.sh ${D}${sysconfdir}/init.d 112 install -m 0755 ${WORKDIR}/dmesg.sh ${D}${sysconfdir}/init.d
112 install -m 0644 ${WORKDIR}/logrotate-dmesg.conf ${D}${sysconfdir}/ 113 install -m 0644 ${WORKDIR}/logrotate-dmesg.conf ${D}${sysconfdir}/