]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
Mount in local mirror if it is provided.
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Tue, 9 Jan 2024 18:57:16 +0000 (19:57 +0100)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Tue, 9 Jan 2024 20:18:44 +0000 (21:18 +0100)
mkosi/installer/apt.py
mkosi/installer/dnf.py
mkosi/installer/pacman.py
mkosi/installer/zypper.py

index 83b9a79672efd0d31d53f3834d42aed12459362b..1d523018a109bcdc70ebe54d82eeb4e515c76ba8 100644 (file)
@@ -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,
index dd2d5a7cf4190cd14e331b9386334b0115b7d9b7..bfadff12a594b15ace631eb5d3b611b840ba6276 100644 (file)
@@ -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",
index beb4258f730346c86c6bb5d7092621df883a6324..f2e086f3e6a595f611649d89bed0bcd5ca358f76 100644 (file)
@@ -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",
index 6457b4bcccb30263ece0da78cc8b6206561cbeac..af8080c6d24f8adc77a8f4d090be79bacb49c1f4 100644 (file)
@@ -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",