From bb486fe9dffb5e9d9a76575b033ab8116a21493b Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Sun, 24 Nov 2024 19:19:52 +0100 Subject: [PATCH] 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. --- mkosi.conf | 3 +-- {mkosi.extra => mkosi.extra.common}/etc/issue | 0 .../systemd/coredump.conf.d/10-coredump-journal-storage.conf | 0 .../usr/lib/systemd/journald.conf.d/ratelimit.conf | 0 .../usr/lib/systemd/leak-sanitizer-suppressions | 0 .../usr/lib/systemd/system-preset/00-mkosi.preset | 0 .../usr/lib/systemd/system-preset/99-mkosi.preset | 0 mkosi.images/initrd/mkosi.conf | 4 +--- 8 files changed, 2 insertions(+), 5 deletions(-) rename {mkosi.extra => mkosi.extra.common}/etc/issue (100%) rename mkosi.coredump-journal-storage.conf => mkosi.extra.common/usr/lib/systemd/coredump.conf.d/10-coredump-journal-storage.conf (100%) rename {mkosi.extra => mkosi.extra.common}/usr/lib/systemd/journald.conf.d/ratelimit.conf (100%) rename mkosi.leak-sanitizer-suppressions => mkosi.extra.common/usr/lib/systemd/leak-sanitizer-suppressions (100%) rename {mkosi.extra => mkosi.extra.common}/usr/lib/systemd/system-preset/00-mkosi.preset (100%) rename {mkosi.extra => mkosi.extra.common}/usr/lib/systemd/system-preset/99-mkosi.preset (100%) diff --git a/mkosi.conf b/mkosi.conf index f2389b7f01..94c8697ded 100644 --- 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 ca28c123af..b76b47ecda 100644 --- 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 -- 2.25.1