]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 213900 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Tue, 25 Aug 2009 02:42:41 +0000 (02:42 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Tue, 25 Aug 2009 02:42:41 +0000 (02:42 +0000)
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
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@213902 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Makefile

index 8e37091f9984edab5a450653d7839c584c85beb8..960d43a4b81bbd6673f2baca523991f4d250d888 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -761,7 +761,7 @@ config:
                        if [ -z "$(DESTDIR)" ]; then /sbin/chkconfig --add asterisk; fi; \
                elif [ -f /etc/debian_version ]; then \
                        $(INSTALL) -m 755 contrib/init.d/rc.debian.asterisk $(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 \
                        $(INSTALL) -m 755 contrib/init.d/rc.gentoo.asterisk $(DESTDIR)/etc/init.d/asterisk; \
                        if [ -z "$(DESTDIR)" ]; then /sbin/rc-update add asterisk default; fi; \