forked from extern/shorewall_code
Fix CONFDIR handling
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6232 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
e7b4985784
commit
1b2428768e
@ -204,6 +204,9 @@ our %capabilities =
|
||||
our %protocols;
|
||||
our %services;
|
||||
|
||||
#
|
||||
# Capabilities
|
||||
#
|
||||
my %capdesc = ( NAT_ENABLED => 'NAT',
|
||||
MANGLE_ENABLED => 'Packet Mangling',
|
||||
MULTIPORT => 'Multi-port Match' ,
|
||||
@ -749,7 +752,7 @@ sub ensure_config_path( $ ) {
|
||||
|
||||
my $f = "$globals{SHAREDIR}/configpath";
|
||||
|
||||
$ENV{CONFDIR} = $export ? '/usr/share/shorewall/configfiles/' : '/etc/shorewall/';
|
||||
$globals{CONFDIR} = '/usr/share/shorewall/configfiles/' if $export;
|
||||
|
||||
unless ( $config{CONFIG_PATH} ) {
|
||||
fatal_error "$f does not exist" unless -f $f;
|
||||
|
Loading…
Reference in New Issue
Block a user