From: Luca Boccassi Date: Sun, 2 Jul 2023 20:01:41 +0000 (+0100) Subject: zypper: respect --local-mirror too X-Git-Tag: v15~96^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1653%2Fhead;p=thirdparty%2Fmkosi.git zypper: respect --local-mirror too --- diff --git a/mkosi/distributions/opensuse.py b/mkosi/distributions/opensuse.py index ae0447ca6..881cb808d 100644 --- a/mkosi/distributions/opensuse.py +++ b/mkosi/distributions/opensuse.py @@ -46,9 +46,14 @@ class OpensuseInstaller(DistributionInstaller): zypper = shutil.which("zypper") - repos = [Repo("repo-oss", f"baseurl={release_url}", fetch_gpgurls(release_url) if not zypper else [])] - if updates_url is not None: - repos += [Repo("repo-update", f"baseurl={updates_url}", fetch_gpgurls(updates_url) if not zypper else [])] + # If we need to use a local mirror, create a temporary repository definition + # that doesn't get in the image, as it is valid only at image build time. + if state.config.local_mirror: + repos = [Repo("local-mirror", f"baseurl={state.config.local_mirror}", [])] + else: + repos = [Repo("repo-oss", f"baseurl={release_url}", fetch_gpgurls(release_url) if not zypper else [])] + if updates_url is not None: + repos += [Repo("repo-update", f"baseurl={updates_url}", fetch_gpgurls(updates_url) if not zypper else [])] if zypper: setup_zypper(state, repos)