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.

diff --git a/mkosi.images/system/coredump-journal-storage.conf b/mkosi.images/system/coredump-journal-storage.conf
new file mode 100644 (file)
index 0000000..cde9785
--- /dev/null
+++ b/mkosi.images/system/coredump-journal-storage.conf
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Coredump]
+Storage=journal

diff --git a/mkosi.images/system/initrd/mkosi.conf b/mkosi.images/system/initrd/mkosi.conf
index 56bd4d0aa7c272c955091718954a7434e036bb1e..ed9bfdc5d8c2c0f7af396258cd0c9d6475f7918c 100644 (file)
--- 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 aad7984ba361617e3cd673828ac72f4311c02209..bc4d80cc05f55cbc4b2562014f92f2f68f9cc52f 100644 (file)
--- 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
 

diff --git a/mkosi.images/system/mkosi.extra/usr/lib/systemd/coredump.conf b/mkosi.images/system/mkosi.extra/usr/lib/systemd/coredump.conf
deleted file mode 100644 (file)
index cde9785..0000000
--- a/mkosi.images/system/mkosi.extra/usr/lib/systemd/coredump.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[Coredump]
-Storage=journal