diff options
| author | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2008-06-25 10:01:11 +0000 |
|---|---|---|
| committer | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2008-06-25 10:01:11 +0000 |
| commit | f543cf5b0c9cbe3053ee445f6f9b2f3506a2e949 (patch) | |
| tree | 9dad753ececa54c19681f6da369da6264c2f4261 /xpp/dahdi_genconf | |
| parent | 5d43e446fe362574ad89b95599411ea4f0fa3192 (diff) | |
* Rename Dahdi::Config::Defaults to Dahdi::Config::GenconfDefaults .
* Reads from the new /etc/dahdi/genconf_parameters .
* Do installl xpp_fxloader (the firmware loading wrapper script).
* Even more /etc/dahdi/system.conf string fixes.
git-svn-id: http://svn.asterisk.org/svn/dahdi/tools/trunk@4463 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'xpp/dahdi_genconf')
| -rwxr-xr-x | xpp/dahdi_genconf | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xpp/dahdi_genconf b/xpp/dahdi_genconf index 83fd0d4..378e8a9 100755 --- a/xpp/dahdi_genconf +++ b/xpp/dahdi_genconf @@ -13,7 +13,7 @@ BEGIN { my $dir = dirname($0); unshift(@INC, "$dir", "$dir/perl_modules"); } use Dahdi; use Dahdi::Xpp; -use Dahdi::Config::Defaults; +use Dahdi::Config::GenconfDefaults; my %default_context = ( FXO => 'from-pstn', @@ -531,13 +531,13 @@ sub gen_chan_dahdi_conf($) { sub set_defaults { # Source default files my ($default_file, %source_defaults) = - Dahdi::Config::Defaults::source_vars(keys(%dahdi_default_vars)); + Dahdi::Config::GenconfDefaults::source_vars(keys(%dahdi_default_vars)); map_dahdi_defaults(%source_defaults); # Fixups foreach my $val (values %default_dahdi_signalling, values %default_chan_dahdi_signalling) { $val =~ s/{fxs_default_start}/$fxs_default_start/g; } - $dahdiconf_file = $ENV{DAHDI_CONF_FILE} || "/etc/dahdi.conf"; + $dahdiconf_file = $ENV{DAHDI_CONF_FILE} || "/etc/dahdi/system.conf"; $chan_dahdi_channels_file = $ENV{CHAN_DAHDI_CHANNELS_FILE} || "/etc/asterisk/dahdi-channels.conf"; $users_file = $ENV{USERS_FILE} || "/etc/asterisk/users.conf"; $chan_dahdi_conf_file = $ENV{CHAN_DAHDI_CONF_FILE} || "/etc/asterisk/chan_dahdi.conf"; @@ -579,7 +579,7 @@ Without arguments, it generates only dahdi and chan_dahdi. =over 4 -=item dahdi - /etc/dahdi.conf +=item dahdi - /etc/dahdi/system.conf Configuration for ztcfg(1). It's location may be overriden by the environment variable DAHDI_CONF_FILE. |