From: Konrad Hammel <konrad@sangoma.com>
Date: Thu, 18 Nov 2010 20:41:46 +0000 (-0500)
Subject: Merge branch 'master' into smgmaster
X-Git-Tag: v1.2.3^2~71^2^2~245^2~32
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2d4b16516ad6ae78cc0d34f105701c75a22d6080;p=thirdparty%2Ffreeswitch.git

Merge branch 'master' into smgmaster
---

2d4b16516ad6ae78cc0d34f105701c75a22d6080
diff --cc src/switch.c
index 7abe1481d1,b04243d59f..ef69bee34e
--- a/src/switch.c
+++ b/src/switch.c
@@@ -48,9 -48,9 +48,9 @@@
  #include "private/switch_core_pvt.h"
  
  /* pid filename: Stores the process id of the freeswitch process */
 -#define PIDFILE "freeswitch.pid"
 +#define PIDFILE "sangoma-media-gateway.pid"
  static char *pfile = PIDFILE;
- 
+ static int system_ready = 0;
  
  /* Picky compiler */
  #ifdef __ICC
@@@ -343,8 -415,10 +415,11 @@@ int main(int argc, char *argv[]
  		"\t-nort                  -- disable clock clock_realtime\n"
  		"\t-stop                  -- stop freeswitch\n"
  		"\t-nc                    -- do not output to a console and background\n"
+ #ifndef WIN32
+ 		"\t-ncwait                -- do not output to a console and background but wait until the system is ready before exiting (implies -nc)\n"
+ #endif
  		"\t-c                     -- output to a console and stay in the foreground\n"
 +		"\t-base [basedir]        -- specify an alternate base dir\n"
  		"\t-conf [confdir]        -- specify an alternate config dir\n"
  		"\t-log [logdir]          -- specify an alternate log dir\n"
  		"\t-run [rundir]          -- specify an alternate run dir\n"