From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sat, 16 Jul 2022 09:23:59 +0000 (+0200)
Subject: Copy systemd manager conf to initrd if set
X-Git-Tag: v14~128
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b623c56497cd63d86540cfaf942f6e1b0583fad;p=thirdparty%2Fmkosi.git

Copy systemd manager conf to initrd if set
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index e8fbd873c..d13a31453 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -1743,6 +1743,10 @@ def configure_dracut(args: MkosiArgs, packages: Set[str], root: Path) -> None:
     with dracut_dir.joinpath("30-mkosi-systemd-extras.conf").open("w") as f:
         for extra in DRACUT_SYSTEMD_EXTRAS:
             f.write(f'install_optional_items+=" {extra} "\n')
+        f.write('install_optional_items+=" /etc/systemd/system.conf "\n')
+        if root.joinpath("etc/systemd/system.conf.d").exists():
+            for conf in root.joinpath("etc/systemd/system.conf.d").iterdir():
+                f.write(f'install_optional_items+=" {Path("/") / conf.relative_to(root)} "\n')
 
     if args.hostonly_initrd:
         dracut_dir.joinpath("30-mkosi-filesystem.conf").write_text(