From 23c5fe7909cc5ee3222331fb822496b580163e04 Mon Sep 17 00:00:00 2001 From: Norbert Lange Date: Sun, 15 Jan 2023 13:52:51 +0100 Subject: [PATCH] package/systemd: handle creation of /var/log/journal journald will always have a runtime log in /run/systemd/journal, and a persistent one in /var/log/journal under certain conditions. By default it will check for the existence of that directory. When /var is not backed by mass-storage you typically don't want your log duplicated and journald should be tuned to account for having only RAM available. With this commit, the directory will no longer be created automatically, but instead it's created only if the root filesystem is writeable. It is rather easy for users to opt-in by either creating that directory (e.g. with a tmpfiles fragment) or editing /etc/systemd/journald.conf. Signed-off-by: Norbert Lange Signed-off-by: Arnout Vandecappelle --- package/systemd/systemd.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index d220673572..824c811c0c 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -63,6 +63,7 @@ SYSTEMD_SELINUX_MODULES = systemd udev xdg SYSTEMD_PROVIDES = udev SYSTEMD_CONF_OPTS += \ + -Dcreate-log-dirs=false \ -Ddbus=false \ -Ddbus-interfaces-dir=no \ -Ddefault-compression='auto' \ @@ -111,6 +112,10 @@ ifeq ($(BR2_nios2),y) SYSTEMD_LDFLAGS = $(TARGET_LDFLAGS) -Wl,--no-fatal-warnings endif +ifeq ($(BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW),y) +SYSTEMD_JOURNALD_PERMISSIONS = /var/log/journal d 2755 root systemd-journal - - - - - +endif + ifeq ($(BR2_PACKAGE_ACL),y) SYSTEMD_DEPENDENCIES += acl SYSTEMD_CONF_OPTS += -Dacl=true @@ -621,6 +626,7 @@ define SYSTEMD_PERMISSIONS /var/lib/private d 700 0 0 - - - - - /var/log/private d 700 0 0 - - - - - /var/cache/private d 700 0 0 - - - - - + $(SYSTEMD_JOURNALD_PERMISSIONS) $(SYSTEMD_LOGIND_PERMISSIONS) $(SYSTEMD_MACHINED_PERMISSIONS) $(SYSTEMD_HOMED_PERMISSIONS) @@ -800,6 +806,7 @@ HOST_SYSTEMD_CONF_OPTS = \ --libdir=lib \ --sysconfdir=/etc \ --localstatedir=/var \ + -Dcreate-log-dirs=false \ -Dmode=release \ -Dutmp=false \ -Dhibernate=false \