[asterisk-commits] trunk r21639 - in /trunk: ./ contrib/scripts/

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Wed Apr 19 16:11:31 2006
New Revision: 21639

URL: http://svn.digium.com/view/asterisk?rev=21639&view=rev
Log:
Merged revisions 21638 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r21638 | kpfleming | 2006-04-19 16:10:41 -0500 (Wed, 19 Apr 2006) | 2 lines

support system-specific scripts in safe_asterisk, before starting Asterisk proper

........

Modified:
    trunk/   (props changed)
    trunk/contrib/scripts/safe_asterisk
    trunk/contrib/scripts/safe_asterisk.8

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: trunk/contrib/scripts/safe_asterisk
URL: http://svn.digium.com/view/asterisk/trunk/contrib/scripts/safe_asterisk?rev=21639&r1=21638&r2=21639&view=diff
==============================================================================
--- trunk/contrib/scripts/safe_asterisk (original)
+++ trunk/contrib/scripts/safe_asterisk Wed Apr 19 16:11:31 2006
@@ -94,9 +94,17 @@
 	exit 1
 fi
 
-#launch_asterisk()
-#{
-#}
+#
+# Run scripts to set any environment variables or do any other system-specific setup needed
+#
+
+if [ -d /etc/asterisk/startup.d ]; then
+	for script in /etc/asterisk/startup.d/*.sh; do
+		if [ -x ${script} ]; then
+			source ${script}
+		fi
+	done
+fi
 
 run_asterisk()
 {

Modified: trunk/contrib/scripts/safe_asterisk.8
URL: http://svn.digium.com/view/asterisk/trunk/contrib/scripts/safe_asterisk.8?rev=21639&r1=21638&r2=21639&view=diff
==============================================================================
--- trunk/contrib/scripts/safe_asterisk.8 (original)
+++ trunk/contrib/scripts/safe_asterisk.8 Wed Apr 19 16:11:31 2006
@@ -40,6 +40,13 @@
 If core files were generated there, they may be 
 .RE
 
+.B /etc/asterisk/startup.d
+.RS
+Files in this directory will be 'source'd by the safe_asterisk script before
+it starts Asterisk proper, allowing them to set additional environment variables
+or run any other steps that are needed for your system.
+.RE
+
 .SH BUGS
 While showing the output on a console is useful, using screen(1) as 
 the terminal may be better.