Parse local drop-in configuration files

systemd · Oct 30, 2024 · 8319338 · 8319338
1 parent b3d1233
commit 8319338
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/mkosi/config.py b/mkosi/config.py
@@ -4075,10 +4075,11 @@ def parse_config_one(self, path: Path, parse_profiles: bool = False, parse_local
         if extras:
             if parse_local:
                 if (
-                    (localpath := path.parent / "mkosi.local/mkosi.conf").exists()
+                    ((localpath := path.parent / "mkosi.local") / "mkosi.conf").exists()
                     or (localpath := path.parent / "mkosi.local.conf").exists()
                 ):  # fmt: skip
-                    self.parse_config_one(localpath)
+                    with chdir(localpath if localpath.is_dir() else Path.cwd()):
+                        self.parse_config_one(localpath if localpath.is_file() else Path("."))
 
                     # Local configuration should override other file based
                     # configuration but not the CLI itself so move the finalized