aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2007-12-05 23:58:38 +0000
committerBadlop <badlop@process-one.net>2007-12-05 23:58:38 +0000
commit5f9de2897364dd68f9ef16b4200ecc4bf302ac33 (patch)
tree1407391b6f5f97aa97937ebc50c3b5de62ca38cc
parent* doc/guide.tex: Improvements in sections: Start, Creating Initial (diff)
* src/ejabberdctl.template: The parameter 'kernel inetrc' is used
even with -sname to guarantee the same behaviour that when using -name (EJAB-317) SVN Revision: 1029
-rw-r--r--ChangeLog4
-rw-r--r--src/ejabberdctl.template4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2fc1a7992..78414194a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2007-12-06 Badlop <badlop@process-one.net>
+ * src/ejabberdctl.template: The parameter 'kernel inetrc' is used
+ even with -sname to guarantee the same behaviour that when using
+ -name (EJAB-317)
+
* doc/guide.tex: Improvements in sections: Start, Creating Initial
Account, Module Overview, Managing an ejabberd server, and
Debugging
diff --git a/src/ejabberdctl.template b/src/ejabberdctl.template
index 9d05b559e..aa8505b96 100644
--- a/src/ejabberdctl.template
+++ b/src/ejabberdctl.template
@@ -35,7 +35,7 @@ if [ $# -ne 0 ] ; then
fi
if [ "$ERLANG_NODE" = "${ERLANG_NODE%.*}" ] ; then
- SNAME="-kernel inetrc \""$EJABBERD_INETRC"\" -sname"
+ SNAME=-sname
else
SNAME=-name
fi
@@ -43,7 +43,7 @@ fi
# Compatibility in ZSH
#setopt shwordsplit 2>/dev/null
-ERLANG_OPTS="$POLL $SMP $PROCESSES $ERL_MAX_ETS_TABLES"
+ERLANG_OPTS="$POLL $SMP $PROCESSES $ERL_MAX_ETS_TABLES -kernel inetrc \""$EJABBERD_INETRC"\" "
start ()
{