diff options
| author | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-01-10 18:12:27 +0000 |
|---|---|---|
| committer | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-01-10 18:12:27 +0000 |
| commit | 9899bafe997a4e020f302c99a6e025b4e8b25191 (patch) | |
| tree | 8a108b05d0f319c95ba83f1d5984ae261572bebf /xpp/utils/zapconf | |
| parent | 1d7d5b07325a186785b22abf09ff531dfc2edd54 (diff) | |
xpp.r5254:
* Improved polarity reversal hangups in FXO (r5194).
Fixed false detection of polarity reversals.
* Optimize xframe allocation, by not zeroing the whole
memory (in get_xframe()).
* Fixed erronous error message that appeared sometimes
from fpga_load during USB renumeration.
* Zaptel::Chans now provides battery() reporting for some FXO
channels (Astribank FXO and wcfxo).
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@3643 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'xpp/utils/zapconf')
| -rwxr-xr-x | xpp/utils/zapconf | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/xpp/utils/zapconf b/xpp/utils/zapconf index 8ddbb81..dd6ab1f 100755 --- a/xpp/utils/zapconf +++ b/xpp/utils/zapconf @@ -502,16 +502,9 @@ sub gen_zapataconf($) { } sub set_defaults { - my $zaptel_boot_debian = $ENV{ZAPTEL_BOOT_DEBIAN} || "/etc/default/zaptel"; - my $zaptel_boot_fedora = $ENV{ZAPTEL_BOOT_FEDORA} || "/etc/sysconfig/zaptel"; - # Source default files - my %source_defaults; - foreach my $defaults ($zaptel_boot_debian, $zaptel_boot_fedora) { - %source_defaults = Zaptel::Config::Defaults::do_source( - $defaults, keys(%zaptel_default_vars)) - if -r $defaults; - } + my ($default_file, %source_defaults) = + Zaptel::Config::Defaults::source_vars(keys(%zaptel_default_vars)); map_zaptel_defaults(%source_defaults); # Fixups foreach my $val (values %default_zaptel_signalling, values %default_zapata_signalling) { |