aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTristan Sloughter <[email protected]>2014-12-15 09:56:06 -0600
committerTristan Sloughter <[email protected]>2014-12-15 09:56:06 -0600
commit98c0290b8be73b31515b6da4c85a6c0f89a69b5a (patch)
treeda626d90fb8e3f70fc925ca43279b40670c0669a
parentabba53cc41747654b50a1eff355172d98d228f77 (diff)
parent785975c9ecb9e3681ca2d6b08a3470192c552b08 (diff)
downloadrelx-98c0290b8be73b31515b6da4c85a6c0f89a69b5a.tar.gz
relx-98c0290b8be73b31515b6da4c85a6c0f89a69b5a.tar.bz2
relx-98c0290b8be73b31515b6da4c85a6c0f89a69b5a.zip
Merge pull request #282 from irccloud/code_loading_mode_env
use CODE_LOADING_MODE in extended bin script
-rw-r--r--priv/templates/extended_bin.dtl3
1 files changed, 2 insertions, 1 deletions
diff --git a/priv/templates/extended_bin.dtl b/priv/templates/extended_bin.dtl
index bd1e981..751b01f 100644
--- a/priv/templates/extended_bin.dtl
+++ b/priv/templates/extended_bin.dtl
@@ -7,6 +7,7 @@ RELEASE_ROOT_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
REL_NAME="{{ rel_name }}"
REL_VSN="{{ rel_vsn }}"
ERTS_VSN="{{ erts_vsn }}"
+CODE_LOADING_MODE="${CODE_LOADING_MODE:-embedded}"
REL_DIR="$RELEASE_ROOT_DIR/releases/$REL_VSN"
ERL_OPTS="{{ erl_opts }}"
RUNNER_LOG_DIR="${RUNNER_LOG_DIR:-$RELEASE_ROOT_DIR/log}"
@@ -359,7 +360,7 @@ case "$1" in
# Build an array of arguments to pass to exec later on
# Build it here because this command will be used for logging.
set -- "$BINDIR/erlexec" $FOREGROUNDOPTIONS \
- -boot "$REL_DIR/$BOOTFILE" -mode embedded -config "$CONFIG_PATH" \
+ -boot "$REL_DIR/$BOOTFILE" -mode "$CODE_LOADING_MODE" -config "$CONFIG_PATH" \
-boot_var ERTS_LIB_DIR "$ERTS_LIB_DIR" \
-args_file "$VMARGS_PATH"