From: Daniel Dickinson <crazycshore@gmail.com>
Date: Sun, 27 Jun 2010 13:36:27 +0000 (+0000)
Subject: net/freeswitch: Change -upstream-defaults and -minimal to use mod_syslog instead... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9f85701c34f02fc3b1770af142375d080a6817b6;p=openwrt%2Fsvn-archive%2Fpackages.git

net/freeswitch: Change -upstream-defaults and -minimal to use mod_syslog instead of mod_console for logging, and start in daemon mode not foreground

SVN-Revision: 21965
---

diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile
index e3da8a00f..a2123b592 100644
--- a/net/freeswitch/Makefile
+++ b/net/freeswitch/Makefile
@@ -164,7 +164,7 @@ $(call Package/freeswitch/Default)
   DEPENDS:= freeswitch \
 		+freeswitch-mod-commands \
 		+freeswitch-mod-conference \
-		+freeswitch-mod-console \
+		+freeswitch-mod-syslog \
 		+freeswitch-mod-curl \
 		+freeswitch-mod-dialplan-xml \
 		+freeswitch-mod-dptools \
@@ -193,7 +193,7 @@ $(call Package/freeswitch/Default)
   TITLE:=FreeSWITCH minimal config
   DEPENDS:= freeswitch \
 		+freeswitch-mod-commands \
-		+freeswitch-mod-console \
+		+freeswitch-mod-syslog \
 		+freeswitch-mod-dialplan-xml \
 		+freeswitch-mod-dptools \
 		+freeswitch-mod-event-socket \
@@ -349,6 +349,8 @@ define Build/Compile
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)" \
 		all $(MAKE_INSTALL_TARGETS)
+	$(SED) 's|^\([:blank:]*\)\(.*\)"mod_console"\(.*\)$$$$|\1<!-- \2"mod_console"\3 -->|' $(PKG_INSTALL_DIR)/etc/freeswitch/autoload_configs/modules.conf.xml
+	$(SED) 's|^\([:blank:]*\)<!-- \(.*\)"mod_syslog"\(.*\) -->\(.*\)$$$$|\1\2"mod_syslog"\3\4 -->|' $(PKG_INSTALL_DIR)/etc/freeswitch/autoload_configs/modules.conf.xml
 endef
 
 define Build/InstallDev
diff --git a/net/freeswitch/files/freeswitch.init b/net/freeswitch/files/freeswitch.init
index a155724da..8637556aa 100644
--- a/net/freeswitch/files/freeswitch.init
+++ b/net/freeswitch/files/freeswitch.init
@@ -15,7 +15,7 @@ start() {
 	mkdir -p $FS_DIR_DB
 	mkdir -p $FS_DIR_LOG
 	ulimit -s 240
-	$FS_DIR/usr/bin/freeswitch $OPTIONS -c &
+	$FS_DIR/usr/bin/freeswitch $OPTIONS -nc
 }
 
 stop() {
@@ -35,3 +35,4 @@ restart() {
 	sleep 10
 	start
 }
+