From: Kai Lüke <kai@amutable.com>
Date: Wed, 15 Jul 2026 07:09:13 +0000 (+0900)
Subject: oci-util: Don't fall back to default registry for explicit registries
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a1c760c43530549ecfbecf09b72fb3c476c44bc1;p=thirdparty%2Fsystemd.git

oci-util: Don't fall back to default registry for explicit registries

When a reference specifies a registry like ghcr.io or quay.io for which
we don't have a registry config file, the fallback forced the default
registry which is wrong.

Only use the default as fallback when there is no explicit registry.
---

diff --git a/src/import/oci-util.c b/src/import/oci-util.c
index a3c5782e989..d727bade978 100644
--- a/src/import/oci-util.c
+++ b/src/import/oci-util.c
@@ -216,7 +216,7 @@ int oci_ref_normalize(char **protocol, char **registry, char **image, char **tag
         _cleanup_fclose_ FILE *f = NULL;
         _cleanup_free_ char *path = NULL;
         r = search_and_fopen_nulstr(fn, "re", /* root= */ NULL, CONF_PATHS_NULSTR("systemd/oci-registry"), &f, &path);
-        if (r == -ENOENT)
+        if (r == -ENOENT && isempty(*registry))
                 r = search_and_fopen_nulstr("default.oci-registry", "re", /* root= */ NULL, CONF_PATHS_NULSTR("systemd/oci-registry"), &f, &path);
         if (r < 0 && r != -ENOENT)
                 return log_debug_errno(r, "Failed to find suitable OCI registry file: %m");