diff options
| author | lmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-09 18:00:16 +0000 |
|---|---|---|
| committer | lmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-09 18:00:16 +0000 |
| commit | 673329fd18878ab1c8ecb45ff479e22c7862c312 (patch) | |
| tree | 205894f1bd7d3fa096c75d735001a8cefe3fd6a9 /contrib | |
| parent | 65c3f5a93329925e55d4d0bea69a48b55b23042c (diff) | |
Merge revision 269347. Update ChangeLog and .version files.
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.6.2.9-rc3@269351 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/init.d/rc.debian.asterisk | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/contrib/init.d/rc.debian.asterisk b/contrib/init.d/rc.debian.asterisk index f88f60e0c..c8e13ef41 100755 --- a/contrib/init.d/rc.debian.asterisk +++ b/contrib/init.d/rc.debian.asterisk @@ -53,7 +53,7 @@ if ! [ -d $ASTETCDIR ] ; then exit 0 fi -# Use the LSB standar functions for services management +# Use the LSB standard functions for services management . /lib/lsb/init-functions case "$1" in @@ -70,7 +70,6 @@ case "$1" in if [ ! -d $ASTVARRUNDIR ]; then mkdir -p $ASTVARRUNDIR fi - if [ $AST_USER ] ; then ASTARGS="-U $AST_USER" chown $AST_USER $ASTVARRUNDIR @@ -79,13 +78,11 @@ case "$1" in ASTARGS="$ASTARGS -G $AST_GROUP" chgrp $AST_GROUP $ASTVARRUNDIR fi - # "start-stop-daemon --oknodo" returns 0 even if Asterisk was already running (as LSB expects): - if test "x$COLOR" = "xyes" ; then - export TERM=linux - start-stop-daemon --start --oknodo --background --exec $DAEMON -- $ASTARGS -c - else - start-stop-daemon --start --oknodo --exec $DAEMON -- $ASTARGS + if test "x$COLOR" = "xno" ; then + ASTARGS="$ASTARGS -n" fi + # "start-stop-daemon --oknodo" returns 0 even if Asterisk was already running (as LSB expects): + start-stop-daemon --start --oknodo --exec $DAEMON -- $ASTARGS log_end_msg $? ;; stop) |