From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
Date: Mon, 12 Jan 2026 14:54:41 +0000 (+0100)
Subject: tree-wide: use full paths to tools defined in config.h
X-Git-Tag: v260-rc1~413
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=96138c62372ae4287e340c7d6cf9c8f3c7bf58d2;p=thirdparty%2Fsystemd.git

tree-wide: use full paths to tools defined in config.h
---

diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
index a4068036046..d51356490e6 100644
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -536,13 +536,13 @@ static int create_disk(
                 }
 
                 fprintf(f,
-                        "ExecStartPost=" LIBEXECDIR "/systemd-makefs '%s' '/dev/mapper/%s'\n",
+                        "ExecStartPost=" SYSTEMD_MAKEFS_PATH " '%s' '/dev/mapper/%s'\n",
                         tmp_fstype_escaped ?: "ext4", name_escaped);
         }
 
         if (swap)
                 fprintf(f,
-                        "ExecStartPost=" LIBEXECDIR "/systemd-makefs swap '/dev/mapper/%s'\n",
+                        "ExecStartPost=" SYSTEMD_MAKEFS_PATH " swap '/dev/mapper/%s'\n",
                         name_escaped);
 
         r = fflush_and_check(f);
diff --git a/src/integritysetup/integritysetup-generator.c b/src/integritysetup/integritysetup-generator.c
index 56c91b734fa..ab01873cdd1 100644
--- a/src/integritysetup/integritysetup-generator.c
+++ b/src/integritysetup/integritysetup-generator.c
@@ -104,8 +104,8 @@ static int create_disk(
                 "Type=oneshot\n"
                 "RemainAfterExit=yes\n"
                 "TimeoutSec=infinity\n"
-                "ExecStart=" LIBEXECDIR "/systemd-integritysetup attach '%s' '%s' '%s' '%s'\n"
-                "ExecStop=" LIBEXECDIR "/systemd-integritysetup detach '%s'\n",
+                "ExecStart=" SYSTEMD_INTEGRITYSETUP_PATH " attach '%s' '%s' '%s' '%s'\n"
+                "ExecStop=" SYSTEMD_INTEGRITYSETUP_PATH " detach '%s'\n",
                 name_escaped, device, empty_to_dash(key_file_escaped), empty_to_dash(options),
                 name_escaped);