[Asterisk-code-review] Allow command-line options to override asterisk.conf. (asterisk[master])

Corey Farrell asteriskteam at digium.com
Fri May 8 20:58:42 CDT 2015


Hello Matt Jordan, George Joseph,

I'd like you to reexamine a change.  Please visit

    https://gerrit.asterisk.org/392

to look at the new patch set (#3).

Change subject: Allow command-line options to override asterisk.conf.
......................................................................

Allow command-line options to override asterisk.conf.

Previous versions of Asterisk processed command-line options before
processing asterisk.conf.  This meant that if an option was set in
asterisk.conf, it could not be overridden with the equivelent command
line option.  This change causes Asterisk to process the command-line
twice.  First it processes options that are needed to load asterisk.conf,
then it processes the remaining options after config is read.

This changes the function of -X slightly.  Previously using -X without
disabling execincludes in asterisk.conf caused #exec to be usable in any
config.  Now -X only enables #exec for the load of asterisk.conf, if it
is wanted in the rest of the system it must be enabled with execincludes
in asterisk.conf.  Updated 'asterisk -h' and 'man asterisk' to reflect
the limited function of -X.

ASTERISK-25042 #close
Reported by: Corey Farrell

Change-Id: I1450d45c15b4467274b871914d893ed4f6564cd7
---
M CHANGES
M UPGRADE.txt
M doc/asterisk.8
M include/asterisk/options.h
M main/asterisk.c
5 files changed, 90 insertions(+), 42 deletions(-)


  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/92/392/3
-- 
To view, visit https://gerrit.asterisk.org/392
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I1450d45c15b4467274b871914d893ed4f6564cd7
Gerrit-PatchSet: 3
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: George Joseph <george.joseph at fairview5.com>
Gerrit-Reviewer: Matt Jordan <mjordan at digium.com>



More information about the asterisk-code-review mailing list