From: Yu Watanabe Date: Fri, 29 Nov 2024 19:31:45 +0000 (+0900) Subject: mkosi: move setting for journald to mkosi.extra X-Git-Tag: v257~55^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F35420%2Fhead;p=thirdparty%2Fsystemd.git mkosi: move setting for journald to mkosi.extra --- diff --git a/mkosi.sanitizers/mkosi.extra/etc/systemd/system/systemd-journald.service.d/10-stdout-tty.conf b/mkosi.sanitizers/mkosi.extra/etc/systemd/system/systemd-journald.service.d/10-stdout-tty.conf new file mode 100644 index 00000000000..c6a2681e3f0 --- /dev/null +++ b/mkosi.sanitizers/mkosi.extra/etc/systemd/system/systemd-journald.service.d/10-stdout-tty.conf @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +[Service] +# Sanitizers log to stderr by default. However, journald's stderr is connected +# to /dev/null, so we lose all the sanitizer logs. To rectify that, let's +# connect journald's stdout to kmsg so that the sanitizer failures end up in the +# journal. +StandardOutput=kmsg diff --git a/mkosi.sanitizers/mkosi.postinst b/mkosi.sanitizers/mkosi.postinst index a6b529a4d6c..e83d05c6bc9 100755 --- a/mkosi.sanitizers/mkosi.postinst +++ b/mkosi.sanitizers/mkosi.postinst @@ -9,17 +9,6 @@ if [[ ! -f "$BUILDROOT/$LIBSYSTEMD" ]]; then exit 0 fi -# Sanitizers log to stderr by default. However, journald's stderr is connected to /dev/null, so we lose -# all the sanitizer logs. To rectify that, let's connect journald's stdout to kmsg so that the sanitizer -# failures end up in the journal. -if [[ -f "$BUILDROOT"/usr/lib/systemd/system/systemd-journald.service ]]; then - mkdir -p "$BUILDROOT"/etc/systemd/system/systemd-journald.service.d - cat >"$BUILDROOT"/etc/systemd/system/systemd-journald.service.d/10-stdout-tty.conf <