From c68c3cb8b25f94d0327b5a36bfed5162af257560 Mon Sep 17 00:00:00 2001 From: Eduard Shishkin Date: Wed, 9 Apr 2025 13:18:49 +0200 Subject: [PATCH] ipl_tools/chreipl: Use S390TOOLS_LIBDIR variable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use S390TOOLS_LIBDIR environment variable to locate the helper script. Reviewed-by: Stefan Haberland Signed-off-by: Eduard Shishkin Signed-off-by: Jan Höppner --- ipl_tools/cmd_chreipl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ipl_tools/cmd_chreipl.c b/ipl_tools/cmd_chreipl.c index 35a3f7e2..30a8ae14 100644 --- a/ipl_tools/cmd_chreipl.c +++ b/ipl_tools/cmd_chreipl.c @@ -16,6 +16,7 @@ #include "lib/util_libc.h" #include "lib/util_proc.h" +#include "lib/util_base.h" #include "lib/zt_common.h" #include "lib/util_path.h" @@ -451,7 +452,7 @@ static int get_chreipl_helper_cmd(dev_t dev, char *dev_name, char cmd[PATH_MAX]) is_md_device(dev_name)) driver_name = UTIL_PROC_DEV_ENTRY_MD; util_asprintf(&chreipl_helper, - "%s/%s.%s", TOOLS_LIBDIR, "chreipl_helper", driver_name); + "%s.%s", util_libdir_path("chreipl_helper"), driver_name); if (access(chreipl_helper, X_OK) != 0) { proc_dev_free_entry(&pde); free(chreipl_helper);