[svn-commits] tilghman: branch 1.6.0 r135484 - in /branches/1.6.0: ./ contrib/init.d/

[SVN commits to the Digium repositories]

Author: tilghman
Date: Mon Aug  4 12:09:17 2008
New Revision: 135484

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

................
r135483 | tilghman | 2008-08-04 12:08:42 -0500 (Mon, 04 Aug 2008) | 11 lines

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

........
r135482 | tilghman | 2008-08-04 12:07:52 -0500 (Mon, 04 Aug 2008) | 2 lines

Define ASTSBINDIR for script
(Closes issue #13221)

........

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

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

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

Modified: branches/1.6.0/contrib/init.d/rc.mandrake.asterisk
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/contrib/init.d/rc.mandrake.asterisk?view=diff&rev=135484&r1=135483&r2=135484
==============================================================================
--- branches/1.6.0/contrib/init.d/rc.mandrake.asterisk (original)
+++ branches/1.6.0/contrib/init.d/rc.mandrake.asterisk Mon Aug  4 12:09:17 2008
@@ -17,6 +17,8 @@
 NOTIFY=root		# Who to notify about crashes
 DUMPDROP=/tmp
 HOSTNAME=`hostname`
+ASTSBINDIR=/usr/sbin
+
 if [ 0`readlink $0` = "0" ]; then
 	CONFIGFILE=/etc/sysconfig/`basename $0`
 else