[OE-core] [PATCH] systemd: Instruct the journal to always be volatile

[Khem Raj]

> On Mar 11, 2015, at 2:28 PM, Randy Witt <randy.e.witt at linux.intel.com> wrote:
> 
> When the storage mode for the journal is "auto" if /var/log/journal
> exists then the journal will flush to /var/log/journal assuming that
> /var/log/journal is persistent.
> 
> However /var/log -> /var/volatile/log in poky, so even though
> /var/log/journal exists, it is still volatile.
> 
> Since this can cause ordering issues due to /var/volatile needing to be mounted before the journal actually writes to it, just specify that the journal
> should always be volatile and never try to write to "persistent"
> storage. The journal will exist in /run/log/journal only.
> 
> This also disables the "After" of the journal on var-volatile.mount
> since the ordering is no longer necessary when the journal is only
> stored in /run/log/journal.
> 
> [Yocto #7388]


This is not right. What if I want persistent logs.? the options is just gone. Both cases should work. /var/volatile should only be used
when doing ro-rfs its not FHS specified anyway. Lets not go with this patch.

> 
> Signed-off-by: Randy Witt <randy.e.witt at linux.intel.com>
> ---
> meta/recipes-core/systemd/systemd/journald-volatile.conf | 6 ------
> meta/recipes-core/systemd/systemd_219.bb                 | 4 ++--
> 2 files changed, 2 insertions(+), 8 deletions(-)
> delete mode 100644 meta/recipes-core/systemd/systemd/journald-volatile.conf
> 
> diff --git a/meta/recipes-core/systemd/systemd/journald-volatile.conf b/meta/recipes-core/systemd/systemd/journald-volatile.conf
> deleted file mode 100644
> index b11e160..0000000
> --- a/meta/recipes-core/systemd/systemd/journald-volatile.conf
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -# If /var/volatile is a mount point then make sure to mount it before
> -# the journal starts. This is because base-files creates a symlink
> -# /var/log -> /var/volatile/log. And if the journal starts before the mount
> -# happens, the journal will appear empty until restarted.
> -[Unit]
> -After=var-volatile.mount
> diff --git a/meta/recipes-core/systemd/systemd_219.bb b/meta/recipes-core/systemd/systemd_219.bb
> index d5eed08..f3bb0c4 100644
> --- a/meta/recipes-core/systemd/systemd_219.bb
> +++ b/meta/recipes-core/systemd/systemd_219.bb
> @@ -48,7 +48,6 @@ SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;branch=master;protocol=
>            file://00-create-volatile.conf \
>            file://init \
>            file://run-ptest \
> -           file://journald-volatile.conf \
>           "
> 
> S = "${WORKDIR}/git"
> @@ -145,7 +144,6 @@ do_install() {
> 	install -m 0644 ${WORKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/
> 
> 	install -m 0644 ${WORKDIR}/00-create-volatile.conf ${D}${sysconfdir}/tmpfiles.d/
> -	install -D -m 0644 ${WORKDIR}/journald-volatile.conf ${D}${systemd_unitdir}/system/systemd-journald.service.d/journald-volatile.conf
> 
> 	if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
> 		install -d ${D}${sysconfdir}/init.d
> @@ -170,6 +168,8 @@ do_install() {
> 
> 	# Enable journal to forward message to syslog daemon
> 	sed -i -e 's/.*ForwardToSyslog.*/ForwardToSyslog=yes/' ${D}${sysconfdir}/systemd/journald.conf
> +	# Make the journal volatile by default.
> +	sed -i -e 's/.*Storage.*/Storage=volatile/' ${D}${sysconfdir}/systemd/journald.conf
> 	# its needed in 216 upstream has fixed it with 919699ec301ea507edce4a619141ed22e789ac0d
> 	# don't order journal flushing afte remote-fs.target
> 	sed -i -e 's/ remote-fs.target$//' ${D}${systemd_unitdir}/system/systemd-journal-flush.service
> -- 
> 1.9.3
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core