From f0f84523afb0176d3a894960d122e430dde1b9bb Mon Sep 17 00:00:00 2001
From: Danny Auble <da@llnl.gov>
Date: Tue, 11 Oct 2005 17:11:16 +0000
Subject: [PATCH] put full path in for slurmd_step
---
src/slurmd/Makefile.am | 3 ++-
src/slurmd/req.c | 7 ++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/slurmd/Makefile.am b/src/slurmd/Makefile.am
index 513105f3d48..c9e8ac0978e 100644
--- a/src/slurmd/Makefile.am
+++ b/src/slurmd/Makefile.am
@@ -6,7 +6,8 @@ AUTOMAKE_OPTIONS = foreign
sbin_PROGRAMS = slurmd slurmd_step
-INCLUDES = -I$(top_srcdir) $(SSL_CPPFLAGS)
+INCLUDES = -I$(top_srcdir) $(SSL_CPPFLAGS) \
+ -DSLURMD_STEP_PATH=\"$(prefix)/sbin/slurmd_step\"
slurmd_LDADD = \
$(top_builddir)/src/common/libcommon.la \
diff --git a/src/slurmd/req.c b/src/slurmd/req.c
index 202fd9f959d..2dc42e2e86c 100644
--- a/src/slurmd/req.c
+++ b/src/slurmd/req.c
@@ -392,10 +392,11 @@ _fork_new_slurmd(slurmd_step_type_t type, void *req,
exit(1);
}
argv = xmalloc(2 * sizeof(char *));
- argv[0] = "slurmd_step";
+ argv[0] = SLURMD_STEP_PATH;
argv[1] = NULL;
- execvp("slurmd_step", argv);
-
+ execvp(argv[0], argv);
+ error("Unable to run slurmd_step in %s", SLURMD_STEP_PATH);
+
if (close(fds[0]) < 0)
error("Unable to close read-pipe in grandchild: %m");
--
GitLab