summaryrefslogtreecommitdiff
path: root/xpp/init_card_9_29
diff options
context:
space:
mode:
Diffstat (limited to 'xpp/init_card_9_29')
-rwxr-xr-xxpp/init_card_9_2928
1 files changed, 13 insertions, 15 deletions
diff --git a/xpp/init_card_9_29 b/xpp/init_card_9_29
index 1e97877..dd3b0a5 100755
--- a/xpp/init_card_9_29
+++ b/xpp/init_card_9_29
@@ -126,23 +126,21 @@ sub set_defaults {
my @pri_specs;
my $match;
my $setup;
+ # For lab tests
+ my $labfile = "${0}.setup";
# Source default files
- foreach my $default_file ("${0}.setup", '/etc/default/zaptel', '/etc/sysconfig/zaptel') {
- next unless -r $default_file;
- my $setup_var = 'XPP_PRI_SETUP';
- my %source_defaults;
- my $setup_string;
- %source_defaults = Zaptel::Config::Defaults::do_source($default_file, $setup_var);
- last unless defined $source_defaults{$setup_var};
- $setup_string = $source_defaults{$setup_var};
- $setup_string =~ s/^\s+//; # trim
- $setup_string =~ s/\s+$//; # trim
- $setup_string =~ s/\s+/\n/g; # cannonical spaces
- logit "From $default_file: $setup_var=\n$setup_string\n";
- @pri_specs = split(/\s+/, $setup_string);
- last;
- }
+ $ENV{ZAPTEL_DEFAULTS} = "$labfile" if -r "$labfile";
+ my $setup_var = 'XPP_PRI_SETUP';
+ my $setup_string;
+ my ($default_file, %source_defaults) =
+ Zaptel::Config::Defaults::source_vars($setup_var);
+ $setup_string = $source_defaults{$setup_var};
+ $setup_string =~ s/^\s+//; # trim
+ $setup_string =~ s/\s+$//; # trim
+ $setup_string =~ s/\s+/\n/g; # cannonical spaces
+ logit "From $default_file: $setup_var=\n$setup_string\n";
+ @pri_specs = split(/\s+/, $setup_string);
push(@pri_specs, 'NUM/*=TE,E1'); # Fall back default (last)
logit "pri_specs: @pri_specs";
SPEC: