From 4ae703b2b50861556f444dff5f3c07b05fcaae39 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Thu, 7 Dec 2023 14:26:10 +0100 Subject: [PATCH] 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. --- src/partition/repart.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); -- 2.39.5