aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJordan Wilberding <[email protected]>2014-03-12 10:23:58 +0100
committerJordan Wilberding <[email protected]>2014-03-12 10:23:58 +0100
commitf2e4ddf2861c3b42205fc6a9e96315cd605031af (patch)
treee194757cc3a198e0cd67d7a33b48093b91ccf682
parent6c962c924086fcfbc8b5e463aa6a50f1521a65f7 (diff)
parent267b906a9f36ef62f432f225fe1dc58915a64785 (diff)
downloadrelx-f2e4ddf2861c3b42205fc6a9e96315cd605031af.tar.gz
relx-f2e4ddf2861c3b42205fc6a9e96315cd605031af.tar.bz2
relx-f2e4ddf2861c3b42205fc6a9e96315cd605031af.zip
Merge pull request #137 from tsloughter/vm_args
use vm.args in basic bin script
-rwxr-xr-x[-rw-r--r--]priv/templates/bin.dtl10
1 files changed, 9 insertions, 1 deletions
diff --git a/priv/templates/bin.dtl b/priv/templates/bin.dtl
index 067e9f7..8f8b048 100644..100755
--- a/priv/templates/bin.dtl
+++ b/priv/templates/bin.dtl
@@ -31,8 +31,16 @@ find_sys_config() {
fi
}
+find_vm_args() {
+ local possible_vm_args=$REL_DIR/vm.args
+ if [ -f "$possible_vm_args" ]; then
+ VM_ARGS="-args_file $possible_vm_args"
+ fi
+}
+
find_erts_dir
find_sys_config
+find_vm_args
export ROOTDIR=$RELEASE_ROOT_DIR
export BINDIR=$ERTS_DIR/bin
export EMU=beam
@@ -41,4 +49,4 @@ export LD_LIBRARY_PATH=$ERTS_DIR/lib:$LD_LIBRARY_PATH
cd $ROOTDIR
-$BINDIR/erlexec $ERL_OPTS $SYS_CONFIG -boot $REL_DIR/$REL_NAME $@
+$BINDIR/erlexec $ERL_OPTS $SYS_CONFIG $VM_ARGS -boot $REL_DIR/$REL_NAME $@