[svn-commits] tilghman: branch 1.6.2 r213903 - in /branches/1.6.2: ./ Makefile

Mon Aug 24 21:42:58 CDT 2009

Author: tilghman
Date: Mon Aug 24 21:42:54 2009
New Revision: 213903

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=213903
Log:
Merged revisions 213900 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r213900 | tilghman | 2009-08-24 21:41:17 -0500 (Mon, 24 Aug 2009) | 11 lines
  
  Merged revisions 213899 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r213899 | tilghman | 2009-08-24 21:40:22 -0500 (Mon, 24 Aug 2009) | 4 lines
    
    Use the default runlevels for Debian derivatives, instead of making up our own.
    (closes issue #14730)
     Reported by: pkempgen
  ........
................

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/Makefile

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

Modified: branches/1.6.2/Makefile
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.2/Makefile?view=diff&rev=213903&r1=213902&r2=213903
==============================================================================

--- branches/1.6.2/Makefile (original)
+++ branches/1.6.2/Makefile Mon Aug 24 21:42:54 2009
@@ -802,7 +802,7 @@
 		elif [ -f /etc/debian_version ]; then \
 			cat contrib/init.d/rc.debian.asterisk | sed 's|__ASTERISK_ETC_DIR__|$(ASTETCDIR)|;s|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > $(DESTDIR)/etc/init.d/asterisk ;\
 			chmod 755 $(DESTDIR)/etc/init.d/asterisk;\
-			if [ -z "$(DESTDIR)" ]; then /usr/sbin/update-rc.d asterisk start 50 2 3 4 5 . stop 91 2 3 4 5 .; fi; \
+			if [ -z "$(DESTDIR)" ]; then /usr/sbin/update-rc.d asterisk defaults 50 91; fi; \
 		elif [ -f /etc/gentoo-release ]; then \
 			cat contrib/init.d/rc.gentoo.asterisk | sed 's|__ASTERISK_ETC_DIR__|$(ASTETCDIR)|;s|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > $(DESTDIR)/etc/init.d/asterisk ;\
 			chmod 755 $(DESTDIR)/etc/init.d/asterisk;\


