From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 9 Jan 2024 18:57:16 +0000 (+0100)
Subject: Mount in local mirror if it is provided.
X-Git-Tag: v20.1~12^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36346ead6d3cc8b16bca046b47587274d0d05293;p=thirdparty%2Fmkosi.git

Mount in local mirror if it is provided.
---

diff --git a/mkosi/installer/apt.py b/mkosi/installer/apt.py
index 83b9a7967..1d523018a 100644
--- a/mkosi/installer/apt.py
+++ b/mkosi/installer/apt.py
@@ -111,6 +111,7 @@ def invoke_apt(
                     "--bind", context.cache_dir / "lib/apt", context.cache_dir / "lib/apt",
                     "--bind", context.cache_dir / "cache/apt", context.cache_dir / "cache/apt",
                     "--ro-bind", context.workspace / "apt.conf", context.workspace / "apt.conf",
+                    *(["--ro-bind", m, m] if (m := context.config.local_mirror) else []),
                     *finalize_crypto_mounts(tools=context.config.tools()),
                     *finalize_source_mounts(context.config),
                     *mounts,
diff --git a/mkosi/installer/dnf.py b/mkosi/installer/dnf.py
index dd2d5a7cf..bfadff12a 100644
--- a/mkosi/installer/dnf.py
+++ b/mkosi/installer/dnf.py
@@ -138,6 +138,7 @@ def invoke_dnf(context: Context, command: str, packages: Iterable[str], apivfs:
                     "--bind",
                     context.cache_dir / "lib" / dnf_subdir(context),
                     context.cache_dir / "lib" / dnf_subdir(context),
+                    *(["--ro-bind", m, m] if (m := context.config.local_mirror) else []),
                     *finalize_crypto_mounts(tools=context.config.tools()),
                     *finalize_source_mounts(context.config),
                     "--chdir", "/work/src",
diff --git a/mkosi/installer/pacman.py b/mkosi/installer/pacman.py
index beb4258f7..f2e086f3e 100644
--- a/mkosi/installer/pacman.py
+++ b/mkosi/installer/pacman.py
@@ -98,6 +98,7 @@ def invoke_pacman(
                 options=[
                     "--bind", context.root, context.root,
                     "--bind", context.cache_dir / "cache/pacman/pkg", context.cache_dir / "cache/pacman/pkg",
+                    *(["--ro-bind", m, m] if (m := context.config.local_mirror) else []),
                     *finalize_crypto_mounts(tools=context.config.tools()),
                     *finalize_source_mounts(context.config),
                     "--chdir", "/work/src",
diff --git a/mkosi/installer/zypper.py b/mkosi/installer/zypper.py
index 6457b4bcc..af8080c6d 100644
--- a/mkosi/installer/zypper.py
+++ b/mkosi/installer/zypper.py
@@ -86,6 +86,7 @@ def invoke_zypper(
                 options=[
                     "--bind", context.root, context.root,
                     "--bind", context.cache_dir / "cache/zypp", context.cache_dir / "cache/zypp",
+                    *(["--ro-bind", m, m] if (m := context.config.local_mirror) else []),
                     *finalize_crypto_mounts(tools=context.config.tools()),
                     *finalize_source_mounts(context.config),
                     "--chdir", "/work/src",