Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/mca/plm/ssh/plm_ssh_module.c
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ static int setup_launch(int *argcptr, char ***argvptr, char *nodename, int *node
prte_plm_ssh_shell_t remote_shell, local_shell;
int orted_argc;
char **orted_argv;
char *orted_cmd, *orted_prefix, *final_cmd;
char *orted_cmd, *orted_prefix, *final_cmd, *daemon_name;
int orted_index;
int rc;
int i;
Expand Down Expand Up @@ -635,7 +635,12 @@ static int setup_launch(int *argcptr, char ***argvptr, char *nodename, int *node
* with the prefix directory
*/
if (NULL != orted_cmd) {
if (0 == strcmp(orted_cmd, "prted")) {
#ifdef PRTE_BINARY_PREFIX
pmix_asprintf(&daemon_name, "%s%s", PRTE_BINARY_PREFIX, "prted");
#else
daemon_name = strdup("prted");
#endif
if (0 == strcmp(orted_cmd, daemon_name)) {
/* if the cmd is our standard one, then add the prefix */
value = pmix_basename(prte_install_dirs.bindir);
if ('/' == prefix_dir[strlen(prefix_dir)-1]) {
Expand All @@ -650,6 +655,7 @@ static int setup_launch(int *argcptr, char ***argvptr, char *nodename, int *node
/* someone specified something different, so don't prefix it */
full_orted_cmd = strdup(orted_cmd);
}
free(daemon_name);
free(orted_cmd);
} else {
/* use our standard one and add the prefix */
Expand Down
Loading