aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTristan Sloughter <[email protected]>2019-08-19 10:19:36 -0600
committerGitHub <[email protected]>2019-08-19 10:19:36 -0600
commitade76d1b9a38130d5cd4713243dca1baf1c43e6a (patch)
tree73275e07c1c144c3c76bb02a5d0d17279090dd95
parent7d70b98ee10fa559c926c926eb6a80e3b582043e (diff)
parentc11c2cd3cdda1f5f46c83c09cf6ddcbcc9ee3a89 (diff)
downloadrelx-master.tar.gz
relx-master.tar.bz2
relx-master.zip
Merge pull request #744 from colrack/start_epmd_fixHEADv3.33.0master
Fix undesired start of epmd when calling relx_get_nodename
-rwxr-xr-xpriv/templates/extended_bin2
1 files changed, 2 insertions, 0 deletions
diff --git a/priv/templates/extended_bin b/priv/templates/extended_bin
index d8aa9b7..c44f145 100755
--- a/priv/templates/extended_bin
+++ b/priv/templates/extended_bin
@@ -154,6 +154,7 @@ relx_get_nodename() {
-mode interactive \
-boot_var ERTS_LIB_DIR "$ERTS_LIB_DIR" \
-eval '[_,H]=re:split(atom_to_list(node()),"@",[unicode,{return,list}]), io:format("~s~n",[H]), halt()' \
+ ${START_EPMD} \
-noshell ${NAME_TYPE} $id
else
# running with setcookie prevents a ~/.erlang.cookie from being created
@@ -162,6 +163,7 @@ relx_get_nodename() {
-boot_var ERTS_LIB_DIR "$ERTS_LIB_DIR" \
-eval '[_,H]=re:split(atom_to_list(node()),"@",[unicode,{return,list}]), io:format("~s~n",[H]), halt()' \
-setcookie ${COOKIE} \
+ ${START_EPMD} \
-noshell ${NAME_TYPE} $id
fi
}