forked from extern/shorewall_code
Give 'do_initialize' a more accurate name
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5541 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
e170fd8dc4
commit
24f61c69c7
@ -5,7 +5,7 @@ use warnings;
|
|||||||
use Shorewall::Common;
|
use Shorewall::Common;
|
||||||
|
|
||||||
our @ISA = qw(Exporter);
|
our @ISA = qw(Exporter);
|
||||||
our @EXPORT = qw(find_file do_initialize report_capabilities propagateconfig append_file %config %env %capabilities );
|
our @EXPORT = qw(find_file get_configuration report_capabilities propagateconfig append_file %config %env %capabilities );
|
||||||
our @EXPORT_OK = ();
|
our @EXPORT_OK = ();
|
||||||
our @VERSION = 1.00;
|
our @VERSION = 1.00;
|
||||||
|
|
||||||
@ -229,7 +229,7 @@ sub report_capabilities() {
|
|||||||
#
|
#
|
||||||
# Read the shorewall.conf file and establish global hashes %config and %env.
|
# Read the shorewall.conf file and establish global hashes %config and %env.
|
||||||
#
|
#
|
||||||
sub do_initialize() {
|
sub get_configuration() {
|
||||||
my $file = find_file 'shorewall.conf';
|
my $file = find_file 'shorewall.conf';
|
||||||
|
|
||||||
if ( -f $file ) {
|
if ( -f $file ) {
|
||||||
|
@ -1659,6 +1659,8 @@ $ENV{VERBOSE} = 2 if $ENV{DEBUG};
|
|||||||
#
|
#
|
||||||
# Get shorewall.conf and capabilities.
|
# Get shorewall.conf and capabilities.
|
||||||
#
|
#
|
||||||
do_initialize;
|
get_configuration;
|
||||||
|
#
|
||||||
|
# Compile/Check the configuration.
|
||||||
|
#
|
||||||
compile_firewall $ARGV[0];
|
compile_firewall $ARGV[0];
|
||||||
|
Loading…
x
Reference in New Issue
Block a user