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

[SVN commits to the Digium repositories]

Author: tilghman
Date: Sun Mar 14 20:37:44 2010
New Revision: 252363

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

................
  r252362 | tilghman | 2010-03-14 20:37:04 -0500 (Sun, 14 Mar 2010) | 11 lines
  
  Merged revisions 252361 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r252361 | tilghman | 2010-03-14 20:33:50 -0500 (Sun, 14 Mar 2010) | 4 lines
    
    Launch Asterisk on Mac OS X with launchd.
    
    Reviewboard: https://reviewboard.asterisk.org/r/551/
  ........
................

Added:
    branches/1.6.0/contrib/init.d/org.asterisk.asterisk.plist
      - copied unchanged from r252362, trunk/contrib/init.d/org.asterisk.asterisk.plist
Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/Makefile
    branches/1.6.0/main/asterisk.c

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

Modified: branches/1.6.0/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/Makefile?view=diff&rev=252363&r1=252362&r2=252363
==============================================================================
--- branches/1.6.0/Makefile (original)
+++ branches/1.6.0/Makefile Sun Mar 14 20:37:44 2010
@@ -786,6 +786,8 @@
 		elif [ -f /etc/SuSE-release -o -f /etc/novell-release ]; then \
 			$(INSTALL) -m 755 contrib/init.d/rc.suse.asterisk $(DESTDIR)/etc/init.d/asterisk; \
 			if [ -z "$(DESTDIR)" ]; then /sbin/chkconfig --add asterisk; fi; \
+		elif [ -d $(DESTDIR)/Library/LaunchDaemons -a ! -f $(DESTDIR)/Library/LaunchDaemons/org.asterisk.asterisk.plist ]; then \
+			$(INSTALL) -m 644 contrib/init.d/org.asterisk.asterisk.plist $(DESTDIR)/Library/LaunchDaemons/org.asterisk.asterisk.plist; \
 		elif [ -f /etc/slackware-version ]; then \
 			echo "Slackware is not currently supported, although an init script does exist for it."; \
 		else \

Modified: branches/1.6.0/main/asterisk.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/main/asterisk.c?view=diff&rev=252363&r1=252362&r2=252363
==============================================================================
--- branches/1.6.0/main/asterisk.c (original)
+++ branches/1.6.0/main/asterisk.c Sun Mar 14 20:37:44 2010
@@ -3303,7 +3303,7 @@
 		} else
 			ast_log(LOG_WARNING, "Unable to open pid file '%s': %s\n", ast_config_AST_PID, strerror(errno));
 #else
-		ast_log(LOG_WARNING, "Mac OS X detected.  Use '/sbin/launchd -d' to launch with the nofork option.\n");
+		ast_log(LOG_WARNING, "Mac OS X detected.  Use 'launchctl load /Library/LaunchDaemon/org.asterisk.asterisk.plist'.\n");
 #endif
 	}
 #endif