From: Joshua Colp <jcolp@digium.com>
Date: Fri, 2 Feb 2007 15:30:12 +0000 (+0000)
Subject: Merged revisions 53114 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~3290
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2c7ede79de67612342e49bbbdbd176229d34fb1c;p=thirdparty%2Fasterisk.git

Merged revisions 53114 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r53114 | file | 2007-02-02 09:29:35 -0600 (Fri, 02 Feb 2007) | 2 lines

Add systemname to asterisk.conf generation per recent discussions about it. (issue #8968 reported by blitzrage)

........


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

diff --git a/Makefile b/Makefile
index 776778071b..f716ed9bab 100644
--- a/Makefile
+++ b/Makefile
@@ -540,6 +540,7 @@ samples: adsi
 		echo "" ; \
 		echo ";[options]" ; \
 		echo ";internal_timing = yes" ; \
+		echo ";systemname = my_system_name ; prefix uniqueid with a system name for global uniqueness issues" ; \
 		echo "; Changing the following lines may compromise your security." ; \
 		echo ";[files]" ; \
 		echo ";astctlpermissions = 0660" ; \