From 4548e53ee5336b06d7b3c023212e19a4945d3292 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Sun, 2 Jun 2024 10:26:20 +0200 Subject: [PATCH] mkosi: Make sure initrd coredumps are also stored in the journal Let's also translate the coredump config into a dropin so we don't accidentally override any existing configuration. --- .../systemd/coredump.conf => coredump-journal-storage.conf} | 0 mkosi.images/system/initrd/mkosi.conf | 4 +++- mkosi.images/system/mkosi.conf | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) rename mkosi.images/system/{mkosi.extra/usr/lib/systemd/coredump.conf => coredump-journal-storage.conf} (100%) diff --git a/mkosi.images/system/mkosi.extra/usr/lib/systemd/coredump.conf b/mkosi.images/system/coredump-journal-storage.conf similarity index 100% rename from mkosi.images/system/mkosi.extra/usr/lib/systemd/coredump.conf rename to mkosi.images/system/coredump-journal-storage.conf diff --git a/mkosi.images/system/initrd/mkosi.conf b/mkosi.images/system/initrd/mkosi.conf index 56bd4d0aa7..ed9bfdc5d8 100644 --- a/mkosi.images/system/initrd/mkosi.conf +++ b/mkosi.images/system/initrd/mkosi.conf @@ -2,4 +2,6 @@ [Content] PostInstallationScripts=../mkosi.sanitizers.chroot -ExtraTrees=../leak-sanitizer-suppressions:/usr/lib/systemd/leak-sanitizer-suppressions +ExtraTrees= + ../leak-sanitizer-suppressions:/usr/lib/systemd/leak-sanitizer-suppressions + ../coredump-journal-storage.conf:/usr/lib/systemd/coredump.conf.d/10-coredump-journal-storage.conf diff --git a/mkosi.images/system/mkosi.conf b/mkosi.images/system/mkosi.conf index aad7984ba3..bc4d80cc05 100644 --- a/mkosi.images/system/mkosi.conf +++ b/mkosi.images/system/mkosi.conf @@ -12,6 +12,7 @@ Autologin=yes ExtraTrees= %D/mkosi.crt:/usr/lib/verity.d/mkosi.crt # sysext verification key leak-sanitizer-suppressions:/usr/lib/systemd/leak-sanitizer-suppressions + coredump-journal-storage.conf:/usr/lib/systemd/coredump.conf.d/10-coredump-journal-storage.conf PostInstallationScripts=mkosi.sanitizers.chroot -- 2.25.1