diff options
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) { |