mirror of
https://gitlab.com/shorewall/code.git
synced 2024-11-24 00:23:28 +01:00
Allow Shorewall-perl to be installed before Shorewall
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6684 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
417707e781
commit
47419bee3f
@ -64,7 +64,7 @@ our @EXPORT = qw(
|
||||
%globals
|
||||
%capabilities );
|
||||
|
||||
our @EXPORT_OK = qw( $shorewall_dir initialize read_a_line1 );
|
||||
our @EXPORT_OK = qw( $shorewall_dir initialize read_a_line1 set_config_path );
|
||||
our $VERSION = 1.00;
|
||||
|
||||
#
|
||||
@ -346,6 +346,13 @@ sub set_shorewall_dir( $ ) {
|
||||
$shorewall_dir = shift;
|
||||
}
|
||||
|
||||
#
|
||||
# Set $globals{CONFIG_PATH}
|
||||
#
|
||||
sub set_config_path( $ ) {
|
||||
$config{CONFIG_PATH} = shift;
|
||||
}
|
||||
|
||||
#
|
||||
# Set $debug
|
||||
#
|
||||
|
@ -34,7 +34,8 @@ use Shorewall::Config qw( open_file
|
||||
fatal_error
|
||||
%globals
|
||||
ensure_config_path
|
||||
set_shorewall_dir );
|
||||
set_shorewall_dir
|
||||
set_config_path );
|
||||
|
||||
our $offset = "\t\t ";
|
||||
|
||||
@ -65,6 +66,8 @@ sub print_service( $$ ) {
|
||||
}
|
||||
}
|
||||
|
||||
set_config_path( '/etc/shorewall:/usr/share/shorewall' );
|
||||
|
||||
set_shorewall_dir($ARGV[0] || '/etc');
|
||||
|
||||
ensure_config_path;
|
||||
|
@ -15,7 +15,7 @@ Source: %{name}-%{version}.tgz
|
||||
URL: http://www.shorewall.net/
|
||||
BuildArch: noarch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
||||
Requires: perl shorewall
|
||||
Requires: perl
|
||||
Provides: shorewall_compiler
|
||||
|
||||
%description
|
||||
|
Loading…
Reference in New Issue
Block a user