From a66a7c412ad99e4bc51d2b59e53d73a975942456 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 29 Nov 2024 14:12:46 +0100 Subject: [PATCH 1/2] Revert "link README.logs from tmpfiles.d/legacy.conf only if available" This reverts commit c946b1357562e8643575dbbda2c8c6fff2c0e4f7. The next patch will resolve the issue in a different way. --- tmpfiles.d/legacy.conf.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tmpfiles.d/legacy.conf.in b/tmpfiles.d/legacy.conf.in index 6726c6c0e5..b475500e58 100644 --- a/tmpfiles.d/legacy.conf.in +++ b/tmpfiles.d/legacy.conf.in @@ -13,12 +13,11 @@ d /run/lock 0755 root root - L /var/lock - - - - ../run/lock - -{% if HAVE_SYSV_COMPAT %} {% if CREATE_LOG_DIRS %} L$ /var/log/README - - - - ../..{{DOC_DIR}}/README.logs {% endif %} +{% if HAVE_SYSV_COMPAT %} # /run/lock/subsys is used for serializing SysV service execution, and # hence without use on SysV-less systems. d /run/lock/subsys 0755 root root - From 4ebd6d9a108beea33f71e39f5ec69f1e2129a7d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 29 Nov 2024 14:15:55 +0100 Subject: [PATCH 2/2] meson: install README.logs independently of HAVE_SYSV_COMPAT That file provides compatiblity (or more precisely the explanation for the lack of compatibility) with syslog daemons. Those are used quite independently of sysvinit. For example, RHEL uses rsyslog with systemd. We create /var/log/journal, so it's no biggie to also provide /var/log/README with the explanation. Let's keep it, since it might help some confused users, even when compat with sysvinit is gone. --- docs/var-log/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/var-log/meson.build b/docs/var-log/meson.build index 35f756cafe..0648be68e6 100644 --- a/docs/var-log/meson.build +++ b/docs/var-log/meson.build @@ -1,6 +1,6 @@ # SPDX-License-Identifier: LGPL-2.1-or-later -if conf.get('HAVE_SYSV_COMPAT') == 1 and get_option('create-log-dirs') +if get_option('create-log-dirs') install_data('README.logs', install_dir : docdir) endif