apt: support including additional configuration for reprepro

diff --git a/mkosi/installer/apt.py b/mkosi/installer/apt.py
index 1d78f22c532a8a477a1f87b856cf144419d88647..cefa13cc0cfb439b28cdea0728ea81361ba80d6e 100644 (file)
--- a/mkosi/installer/apt.py
+++ b/mkosi/installer/apt.py
@@ -282,18 +282,20 @@ class Apt(PackageManager):
 
         if not (conf := context.repository / "conf/distributions").exists():
             conf.parent.mkdir(exist_ok=True)
-            conf.write_text(
-                textwrap.dedent(
-                    f"""\
-                    Origin: mkosi
-                    Label: mkosi
-                    Architectures: {context.config.distribution.architecture(context.config.architecture)}
-                    Codename: mkosi
-                    Components: main
-                    Description: mkosi local repository
-                    """
-                )
+            distconfig = textwrap.dedent(
+                f"""\
+                Origin: mkosi
+                Label: mkosi
+                Architectures: {context.config.distribution.architecture(context.config.architecture)}
+                Codename: mkosi
+                Components: main
+                Description: mkosi local repository
+                """
             )
+            for distconfinclude in ("usr/lib/reprepro/", "etc/reprepro/"):
+                if (context.sandbox_tree / distconfinclude).exists():
+                    distconfig += f"!include: /{distconfinclude}\n"
+            conf.write_text(distconfig)
 
         run(
             [

diff --git a/mkosi/resources/man/mkosi.1.md b/mkosi/resources/man/mkosi.1.md
index 429c9c9e018fb1aa0d720125e3acbd82d7050e6a..1b3810e3a76b52dc24a913c9ec44daff039fb46c 100644 (file)
--- a/mkosi/resources/man/mkosi.1.md
+++ b/mkosi/resources/man/mkosi.1.md
@@ -772,6 +772,10 @@ boolean argument: either `1`, `yes`, or `true` to enable, or `0`, `no`,
     running scripts. If the `mkosi.packages/` directory is found in the local
     directory it is also used for this purpose.
 
+    On deb-based distributions the local repository will be created with **reprepro** and additional
+    configuration for reprepro will be included from `/usr/lib/reprepro` and `/etc/reprepro` in the sandbox
+    trees, see **reprepro(1)** for details on reprepro configuration includes.
+
 `VolatilePackageDirectories=`, `--volatile-package-directory=`
 :   Like `PackageDirectories=`, but any changes to the packages in these
     directories will not invalidate the cached images if `Incremental=`