aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Stewart <[email protected]>2014-06-01 23:38:07 -0400
committerTim Stewart <[email protected]>2014-06-01 23:46:16 -0400
commit37a6c8892a71f093f24fceae1697c88029afbffb (patch)
tree2c47ee9f51bd363396f3e675b6768d257bedba7f
parent916e29bc7d4cb0df5215334968bb3d42c04f9bee (diff)
downloadrelx-37a6c8892a71f093f24fceae1697c88029afbffb.tar.gz
relx-37a6c8892a71f093f24fceae1697c88029afbffb.tar.bz2
relx-37a6c8892a71f093f24fceae1697c88029afbffb.zip
Run nodetool using results of find_erts_dir
Before this change, extended_bin.dtl assumes the release uses an embedded erts release when calling nodetool, making any nodetool-related functionality incompatible with the following setting: {include_erts, false} This change calls nodetool using the escript binary in the path discovered in the find_erts_dir function.
-rw-r--r--priv/templates/extended_bin.dtl2
1 files changed, 1 insertions, 1 deletions
diff --git a/priv/templates/extended_bin.dtl b/priv/templates/extended_bin.dtl
index bb3e8d7..d4b65d3 100644
--- a/priv/templates/extended_bin.dtl
+++ b/priv/templates/extended_bin.dtl
@@ -45,7 +45,7 @@ relx_gen_id() {
# Control a node
relx_nodetool() {
command="$1"; shift
- "erts-$ERTS_VSN/bin/escript" "$ROOTDIR/bin/nodetool" "$NAME_TYPE" "$NAME" \
+ "$ERTS_DIR/bin/escript" "$ROOTDIR/bin/nodetool" "$NAME_TYPE" "$NAME" \
-setcookie "$COOKIE" "$command"
}