mkosi: move setting for journald to mkosi.extra

mhs-emlogic · Nov 29, 2024 · 9c4670d · 9c4670d
1 parent b75befc
commit 9c4670d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/...i.sanitizers/mkosi.extra/etc/systemd/system/systemd-journald.service.d/10-stdout-tty.conf b/...i.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
@@ -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 <<EOF
-[Service]
-StandardOutput=kmsg
-EOF
-fi
-
 # ASAN and syscall filters aren't compatible with each other.
 find "$BUILDROOT"/usr "$BUILDROOT"/etc -name '*.service' -type f -exec sed -i 's/^\(MemoryDeny\|SystemCall\)/# \1/' {} +