Skip to content

Replace VM_ARGS with ARGS_FILE which is borrowed from couchdb startup #2738

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wohali merged 3 commits into from
Apr 22, 2020
Merged

Replace VM_ARGS with ARGS_FILE which is borrowed from couchdb startup #2738

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0275ef
Replace VM_ARGS with ARGS_FILE which is set as it is in couchdb scrip…
Mar 31, 2020
7e6f777
Merge branch 'master' into 2176-remsh-parses-name-from-vm_args
sklassen Apr 5, 2020
1883267
Merge branch 'master' into 2176-remsh-parses-name-from-vm_args
wohali Apr 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions rel/overlay/bin/remsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,28 @@ BINDIR=$ROOTDIR/erts-$ERTS_VSN/bin

PROGNAME=${0##*/}
VERBOSE=""
NODE="[email protected]"
DEFAULT_NODE="[email protected]"
LHOST=127.0.0.1
VM_ARGS=$COUCHDB_BIN_DIR/../etc/vm.args

ARGS_FILE="${COUCHDB_ARGS_FILE:-$ROOTDIR/etc/vm.args}"

# If present, extract cookie from ERL_FLAGS
# This is used by the CouchDB Dockerfile and Helm chart
NODE=$(echo "$ERL_FLAGS" | sed 's/^.*name \([^ ][^ ]*\).*$/\1/g')
if test -f "$ARGS_FILE"; then
# else attempt to extract from vm.args
ARGS_FILE_COOKIE=$(awk '$1=="-name"{print $2}' "$ARGS_FILE")
NODE="${NODE:-$ARGS_FILE_COOKIE}"
fi
NODE="${NODE:-$DEFAULT_NODE}"

# If present, extract cookie from ERL_FLAGS
# This is used by the CouchDB Dockerfile and Helm chart
COOKIE=$(echo "$ERL_FLAGS" | sed 's/^.*setcookie \([^ ][^ ]*\).*$/\1/g')
if test -f "$VM_ARGS"; then
if test -f "$ARGS_FILE"; then
# else attempt to extract from vm.args
VM_ARGS_COOKIE=$(awk '$1=="-setcookie"{print $2}' "$VM_ARGS")
COOKIE="${COOKIE:-$VM_ARGS_COOKIE}"
ARGS_FILE_COOKIE=$(awk '$1=="-setcookie"{print $2}' "$ARGS_FILE")
COOKIE="${COOKIE:-$ARGS_FILE_COOKIE}"
fi
COOKIE="${COOKIE:-monster}"

Expand Down