mkosi: Use shared extra tree between initrd and main image

Let's share more between initrd and main system and use a shared
extra tree to achieve that.

diff --git a/mkosi.conf b/mkosi.conf
index f2389b7f012e553d6531d8701b8095e7f6bc8ceb..94c8697ded3aa2c9b5d3ce036f499521e4ffc60e 100644 (file)
--- a/mkosi.conf
+++ b/mkosi.conf
@@ -38,9 +38,8 @@ SignExpectedPcr=yes
 
 [Content]
 ExtraTrees=
+        mkosi.extra.common
         mkosi.crt:/usr/lib/verity.d/mkosi.crt # sysext verification key
-        mkosi.leak-sanitizer-suppressions:/usr/lib/systemd/leak-sanitizer-suppressions
-        mkosi.coredump-journal-storage.conf:/usr/lib/systemd/coredump.conf.d/10-coredump-journal-storage.conf
         %O/minimal-0.root-%a.raw:/usr/share/minimal_0.raw
         %O/minimal-0.root-%a-verity.raw:/usr/share/minimal_0.verity
         %O/minimal-0.root-%a-verity-sig.raw:/usr/share/minimal_0.verity.sig

diff --git a/mkosi.extra/etc/issue b/mkosi.extra.common/etc/issue
similarity index 100%
rename from mkosi.extra/etc/issue
rename to mkosi.extra.common/etc/issue

diff --git a/mkosi.coredump-journal-storage.conf b/mkosi.extra.common/usr/lib/systemd/coredump.conf.d/10-coredump-journal-storage.conf
similarity index 100%
rename from mkosi.coredump-journal-storage.conf
rename to mkosi.extra.common/usr/lib/systemd/coredump.conf.d/10-coredump-journal-storage.conf

diff --git a/mkosi.extra/usr/lib/systemd/journald.conf.d/ratelimit.conf b/mkosi.extra.common/usr/lib/systemd/journald.conf.d/ratelimit.conf
similarity index 100%
rename from mkosi.extra/usr/lib/systemd/journald.conf.d/ratelimit.conf
rename to mkosi.extra.common/usr/lib/systemd/journald.conf.d/ratelimit.conf

diff --git a/mkosi.leak-sanitizer-suppressions b/mkosi.extra.common/usr/lib/systemd/leak-sanitizer-suppressions
similarity index 100%
rename from mkosi.leak-sanitizer-suppressions
rename to mkosi.extra.common/usr/lib/systemd/leak-sanitizer-suppressions

diff --git a/mkosi.extra/usr/lib/systemd/system-preset/00-mkosi.preset b/mkosi.extra.common/usr/lib/systemd/system-preset/00-mkosi.preset
similarity index 100%
rename from mkosi.extra/usr/lib/systemd/system-preset/00-mkosi.preset
rename to mkosi.extra.common/usr/lib/systemd/system-preset/00-mkosi.preset

diff --git a/mkosi.extra/usr/lib/systemd/system-preset/99-mkosi.preset b/mkosi.extra.common/usr/lib/systemd/system-preset/99-mkosi.preset
similarity index 100%
rename from mkosi.extra/usr/lib/systemd/system-preset/99-mkosi.preset
rename to mkosi.extra.common/usr/lib/systemd/system-preset/99-mkosi.preset

diff --git a/mkosi.images/initrd/mkosi.conf b/mkosi.images/initrd/mkosi.conf
index ca28c123afd0429536e2d5b52a7fda889eab86a5..b76b47ecdaa3289df004b0ec30d27924b87e04ec 100644 (file)
--- a/mkosi.images/initrd/mkosi.conf
+++ b/mkosi.images/initrd/mkosi.conf
@@ -6,9 +6,7 @@ Include=
         %D/mkosi.sanitizers
 
 [Content]
-ExtraTrees=
-        %D/mkosi.leak-sanitizer-suppressions:/usr/lib/systemd/leak-sanitizer-suppressions
-        %D/mkosi.coredump-journal-storage.conf:/usr/lib/systemd/coredump.conf.d/10-coredump-journal-storage.conf
+ExtraTrees=%D/mkosi.extra.common
 
 Packages=
         findutils