aboutsummaryrefslogtreecommitdiffstats
path: root/priv
diff options
context:
space:
mode:
authorTristan Sloughter <[email protected]>2014-11-22 11:23:47 -0600
committerTristan Sloughter <[email protected]>2014-11-22 20:07:08 -0600
commitf89df2f4d693c8522fc9b911a6fc5bef31f338fc (patch)
tree6e25253e9b9db2ef73075d4753b060c2b9d7b854 /priv
parent2c9d7f4d79cb66f1bc306cac86d7ed02489b0f80 (diff)
downloadrelx-f89df2f4d693c8522fc9b911a6fc5bef31f338fc.tar.gz
relx-f89df2f4d693c8522fc9b911a6fc5bef31f338fc.tar.bz2
relx-f89df2f4d693c8522fc9b911a6fc5bef31f338fc.zip
if include_erts is false, do not include stdlibs
Diffstat (limited to 'priv')
-rwxr-xr-xpriv/templates/bin.dtl3
-rw-r--r--priv/templates/extended_bin.dtl4
2 files changed, 6 insertions, 1 deletions
diff --git a/priv/templates/bin.dtl b/priv/templates/bin.dtl
index bb83434..434cbd4 100755
--- a/priv/templates/bin.dtl
+++ b/priv/templates/bin.dtl
@@ -47,6 +47,7 @@ export BINDIR="$ERTS_DIR/bin"
export EMU="beam"
export PROGNAME="erl"
export LD_LIBRARY_PATH="$ERTS_DIR/lib:$LD_LIBRARY_PATH"
+ERTS_LIB_DIR="$ERTS_DIR/../lib"
cd "$ROOTDIR"
@@ -57,7 +58,7 @@ ARGS="$@"
set -- "$ERL_OPTS"
[ "$SYS_CONFIG" ] && set -- "$@" -config "$SYS_CONFIG"
[ "$VM_ARGS" ] && set -- "$@" -args_file "$VM_ARGS"
-set -- "$@" -boot "$REL_DIR/$REL_NAME" "$ARGS"
+set -- "$@" -boot_var ERTS_LIB_DIR "$ERTS_LIB_DIR" -boot "$REL_DIR/$REL_NAME" "$ARGS"
# Boot the release
$BINDIR/erlexec $@
diff --git a/priv/templates/extended_bin.dtl b/priv/templates/extended_bin.dtl
index fa77a4a..bd1e981 100644
--- a/priv/templates/extended_bin.dtl
+++ b/priv/templates/extended_bin.dtl
@@ -36,6 +36,7 @@ relx_rem_sh() {
# Setup remote shell command to control node
exec "$BINDIR/erl" "$NAME_TYPE" "$id" -remsh "$NAME" -boot start_clean \
+ -boot_var ERTS_LIB_DIR "$ERTS_LIB_DIR" \
-setcookie "$COOKIE" -kernel net_ticktime $TICKTIME
}
@@ -146,6 +147,7 @@ export BINDIR="$ERTS_DIR/bin"
export EMU="beam"
export PROGNAME="erl"
export LD_LIBRARY_PATH="$ERTS_DIR/lib:$LD_LIBRARY_PATH"
+ERTS_LIB_DIR="$ERTS_DIR/../lib"
cd "$ROOTDIR"
@@ -321,6 +323,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" -boot "$BOOTFILE" \
+ -boot_var ERTS_LIB_DIR "$ERTS_LIB_DIR" \
-env ERL_LIBS "$REL_DIR/lib" -config "$CONFIG_PATH" \
-args_file "$VMARGS_PATH"
@@ -357,6 +360,7 @@ case "$1" in
# 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_var ERTS_LIB_DIR "$ERTS_LIB_DIR" \
-args_file "$VMARGS_PATH"
# Dump environment info for logging purposes