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/perl_modules/Dahdi/Config | |
| 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/perl_modules/Dahdi/Config')
| -rw-r--r-- | xpp/perl_modules/Dahdi/Config/GenconfDefaults.pm (renamed from xpp/perl_modules/Dahdi/Config/Defaults.pm) | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/xpp/perl_modules/Dahdi/Config/Defaults.pm b/xpp/perl_modules/Dahdi/Config/GenconfDefaults.pm index e720568..9988929 100644 --- a/xpp/perl_modules/Dahdi/Config/Defaults.pm +++ b/xpp/perl_modules/Dahdi/Config/GenconfDefaults.pm @@ -1,4 +1,4 @@ -package Dahdi::Config::Defaults; +package Dahdi::Config::GenconfDefaults; # # Written by Oron Peled <oron@actcom.co.il> # Copyright (C) 2007, Xorcom @@ -28,29 +28,11 @@ sub do_source($@) { sub source_vars { my @vars = @_; - my $default_file; - my %system_files = ( - "/etc/default/zaptel" => 'Debian and friends', - "/etc/sysconfig/zaptel" => 'Red Hat and friends', - "/etc/dahdi/defaults" => 'Dahdi generic', - ); - - if(defined $ENV{DAHDI_DEFAULTS}) { - $default_file = $ENV{DAHDI_DEFAULTS}; - } else { - foreach my $f (keys %system_files) { - if(-r $f) { - if(defined $default_file) { - die "An '$f' collides with '$default_file'"; - } - $default_file = $f; - } - } - } - if (! $default_file) { + my $default_file = $ENV{GENCONF_PARAMETERS} || "/etc/dahdi/genconf_parameters"; + if (! -r $default_file) { return ("", ()); } - my %vars = Dahdi::Config::Defaults::do_source($default_file, @vars); + my %vars = do_source($default_file, @vars); return ($default_file, %vars); } |