[asterisk-commits] tilghman: branch 1.6.0 r136192 - in /branches/1.6.0: ./ contrib/init.d/

[SVN commits to the Asterisk project]

Author: tilghman
Date: Wed Aug  6 15:16:13 2008
New Revision: 136192

URL: http://svn.digium.com/view/asterisk?view=rev&rev=136192
Log:
Merged revisions 136191 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r136191 | tilghman | 2008-08-06 15:15:34 -0500 (Wed, 06 Aug 2008) | 12 lines

Merged revisions 136190 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r136190 | tilghman | 2008-08-06 15:14:54 -0500 (Wed, 06 Aug 2008) | 4 lines

-C option takes a filename, not a directory path.
(closes issue #13007)
 Reported by: klaus3000

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/contrib/init.d/rc.redhat.asterisk

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/contrib/init.d/rc.redhat.asterisk
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/contrib/init.d/rc.redhat.asterisk?view=diff&rev=136192&r1=136191&r2=136192
==============================================================================
--- branches/1.6.0/contrib/init.d/rc.redhat.asterisk (original)
+++ branches/1.6.0/contrib/init.d/rc.redhat.asterisk Wed Aug  6 15:16:13 2008
@@ -88,7 +88,7 @@
 		ASTARGS="$ASTARGS -G $AST_GROUP"
 	fi
 	if [ $AST_CONFIG ]; then
-		ASTARGS="$ASTARGS -C $AST_CONFIG"
+		ASTARGS="$ASTARGS -C $AST_CONFIG/asterisk.conf"
 	fi
 	daemon $DAEMON $ASTARGS
 	RETVAL=$?