From: Automerge script <automerge@asterisk.org>
Date: Wed, 19 Apr 2006 22:05:55 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.8-netsec~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37a6092b271e292099e04dbb9a314b6c2ee34de5;p=thirdparty%2Fasterisk.git

automerge commit

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

diff --git a/contrib/scripts/safe_asterisk b/contrib/scripts/safe_asterisk
index 2cfab55dae..5a8808a56f 100644
--- a/contrib/scripts/safe_asterisk
+++ b/contrib/scripts/safe_asterisk
@@ -34,9 +34,17 @@ fi
 #
 ulimit -c unlimited
 
-#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()
 {
diff --git a/contrib/scripts/safe_asterisk.8 b/contrib/scripts/safe_asterisk.8
index 277fa5f8dc..ebd95142ab 100644
--- a/contrib/scripts/safe_asterisk.8
+++ b/contrib/scripts/safe_asterisk.8
@@ -40,6 +40,13 @@ safe_asterisk runs in that directory, rather than in / as usual.
 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.