diff options
author | Tristan Sloughter <[email protected]> | 2014-05-18 09:00:07 -0500 |
---|---|---|
committer | Tristan Sloughter <[email protected]> | 2014-05-18 09:00:07 -0500 |
commit | f3ae095ce3eacfae1fc1e62822e257a7780fd4ee (patch) | |
tree | 1c8375ac845b6409d94a53a6eebe076e7691c42c | |
parent | 6127841b1aebd375b9d4e9f837e8bec07e2fa357 (diff) | |
parent | 2489cb005501ca8acb5889c832cb9d9fb3c1b1f5 (diff) | |
download | relx-f3ae095ce3eacfae1fc1e62822e257a7780fd4ee.tar.gz relx-f3ae095ce3eacfae1fc1e62822e257a7780fd4ee.tar.bz2 relx-f3ae095ce3eacfae1fc1e62822e257a7780fd4ee.zip |
Merge pull request #184 from jwilberding/fix_foregroundv1.0.1
Fix foreground
-rw-r--r-- | priv/templates/extended_bin.dtl | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/priv/templates/extended_bin.dtl b/priv/templates/extended_bin.dtl index 0b6c763..99014fd 100644 --- a/priv/templates/extended_bin.dtl +++ b/priv/templates/extended_bin.dtl @@ -30,7 +30,7 @@ relx_rem_sh() { # Generate a unique id used to allow multiple remsh to the same node # transparently id="remsh$(relx_gen_id)-${NAME}" - + # Setup remote shell command to control node exec "$BINDIR/erl" "$NAME_TYPE" "$id" -remsh "$NAME" -boot start_clean \ -setcookie "$COOKIE" @@ -60,8 +60,8 @@ if [ -z "$VMARGS_PATH" ]; then VMARGS_PATH="$RELEASE_ROOT_DIR/vm.args" USE_DIR="$RELEASE_ROOT_DIR" else - USE_DIR="$REL_DIR" - VMARGS_PATH="$REL_DIR/vm.args" + USE_DIR="$REL_DIR" + VMARGS_PATH="$REL_DIR/vm.args" fi fi @@ -156,7 +156,7 @@ case "$1" in # Set arguments for the heart command set -- "$SCRIPT_DIR/$REL_NAME" "$HEART_OPTION" [ "$RUN_PARAM" ] && set -- "$@" "$RUN_PARAM" - + # Export the HEART_COMMAND HEART_COMMAND="$@" export HEART_COMMAND @@ -298,7 +298,7 @@ case "$1" in export PROGNAME # Store passed arguments since they will be erased by `set` - ARGS="$@" + ARGS="$@" # Build an array of arguments to pass to exec later on # Build it here because this command will be used for logging. @@ -323,7 +323,7 @@ case "$1" in # or other supervision services [ -f "$REL_DIR/$REL_NAME.boot" ] && BOOTFILE="$REL_NAME" || BOOTFILE=start - FOREGROUNDOPTIONS="-noinput +Bd" + FOREGROUNDOPTIONS="-noshell -noinput +Bd" # Setup beam-required vars EMU=beam @@ -333,11 +333,11 @@ case "$1" in export PROGNAME # Store passed arguments since they will be erased by `set` - ARGS="$@" + ARGS="$@" # 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" \ + set -- "$BINDIR/erlexec" $FOREGROUNDOPTIONS \ -boot "$REL_DIR/$BOOTFILE" -mode embedded -config "$CONFIG_PATH" \ -args_file "$VMARGS_PATH" |