diff options
| author | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2008-06-19 13:36:15 +0000 |
|---|---|---|
| committer | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2008-06-19 13:36:15 +0000 |
| commit | 9d886a8e34490fabc3a1e3a0ebba5f8a43a6fd49 (patch) | |
| tree | 8ac596c49aed7284efdb19c2b97900248436aa44 /drivers/dahdi/xpp/XppConfig.pm | |
| parent | 55896756afb1dc68c66712885cd310f8a11494e2 (diff) | |
Further XPP driver adjustments:
* More complete Kconfig.
* Verification of FXO init script moved here from tools.
* Perl init scripts are verified.
* Correct name XppConf*ig*.
* Add the files for xpp_mmap .
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@4408 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/xpp/XppConfig.pm')
| -rw-r--r-- | drivers/dahdi/xpp/XppConfig.pm | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/dahdi/xpp/XppConfig.pm b/drivers/dahdi/xpp/XppConfig.pm index 2ccb6a9..1485a0d 100644 --- a/drivers/dahdi/xpp/XppConfig.pm +++ b/drivers/dahdi/xpp/XppConfig.pm @@ -1,4 +1,4 @@ -package XppConf; +package XppConfig; # # Written by Oron Peled <oron@actcom.co.il> # Copyright (C) 2008, Xorcom @@ -11,8 +11,6 @@ use strict; my $conf_file = "/etc/dahdi/xpp.conf"; -$conf_file = $ENV{XPP_CONFIG} if $ENV{XPP_CONFIG}; - sub subst_var($$) { my $lookup = shift; my $string = shift; @@ -55,7 +53,13 @@ LINE: return %xpp_config; } -my %x = read_config($conf_file); +sub import { + my $pack = shift || die "Import without package?"; + my $init_dir = shift || die "$pack::import -- missing init_dir parameter"; + my $local_conf = "$init_dir/xpp.conf"; + $conf_file = $local_conf if -r $local_conf; + my %x = read_config($conf_file); +} sub show_vars { my $assoc = shift; @@ -79,6 +83,5 @@ sub source_vars { return ($conf_file, %result); } -source_vars(qw(XPP_PRI_SETUP opermode)); 1; |