From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 7 Dec 2023 13:26:10 +0000 (+0100)
Subject: repart: Don't look for --make-ddi= definitions inside --root=
X-Git-Tag: v256-rc1~1547
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ae703b2b50861556f444dff5f3c07b05fcaae39;p=thirdparty%2Fsystemd.git

repart: Don't look for --make-ddi= definitions inside --root=

It doesn't really make sense to go looking for these inside the
given root directory. While we should resolve specifiers and such
based on the given root directory, let's look up the image definitions
on the host system as there's a good chance they're coupled to the
repart version we're using so there's all kinds of chances for problems
if we use the definitions from the image we're building instead of those
from the host.
---

diff --git a/src/partition/repart.c b/src/partition/repart.c
index aa0269e7309..3a92d1be1c1 100644
--- a/src/partition/repart.c
+++ b/src/partition/repart.c
@@ -7578,7 +7578,7 @@ static int run(int argc, char *argv[]) {
                 if (!d)
                         return log_oom();
 
-                r = search_and_access(d, F_OK, arg_root, CONF_PATHS_USR_STRV("systemd/repart/definitions"), &dp);
+                r = search_and_access(d, F_OK, NULL, CONF_PATHS_USR_STRV("systemd/repart/definitions"), &dp);
                 if (r < 0)
                         return log_error_errno(r, "DDI type '%s' is not defined: %m", arg_make_ddi);