mirror of
https://gitlab.com/shorewall/code.git
synced 2025-06-01 15:35:50 +02:00
Change shorewall-pl to shorewall-perl
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5725 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
36d0f20d57
commit
9edff873c9
@ -5668,13 +5668,13 @@ case "$COMMAND" in
|
|||||||
check)
|
check)
|
||||||
[ $# -ne 1 ] && usage
|
[ $# -ne 1 ] && usage
|
||||||
do_initialize
|
do_initialize
|
||||||
[ -n "$SHOREWALL_PL" ] && exec perl $debug /usr/share/shorewall-pl/compiler.pl || compile_firewall
|
[ -n "$SHOREWALL_PERL" ] && exec perl $debug /usr/share/shorewall-perl/compiler.pl || compile_firewall
|
||||||
;;
|
;;
|
||||||
|
|
||||||
compile)
|
compile)
|
||||||
[ $# -ne 2 ] && usage
|
[ $# -ne 2 ] && usage
|
||||||
do_initialize
|
do_initialize
|
||||||
[ -n "$SHOREWALL_PL" ] && exec perl $debug /usr/share/shorewall-pl/compiler.pl $2 || compile_firewall $2
|
[ -n "$SHOREWALL_PERL" ] && exec perl $debug /usr/share/shorewall-perl/compiler.pl $2 || compile_firewall $2
|
||||||
;;
|
;;
|
||||||
|
|
||||||
call)
|
call)
|
||||||
|
@ -1787,11 +1787,11 @@ do_initialize() {
|
|||||||
|
|
||||||
[ -f $VERSION_FILE ] && VERSION=$(cat $VERSION_FILE)
|
[ -f $VERSION_FILE ] && VERSION=$(cat $VERSION_FILE)
|
||||||
|
|
||||||
[ -d /usr/share/shorewall-pl ] && set -a;
|
[ -d /usr/share/shorewall-perl ] && set -a;
|
||||||
|
|
||||||
run_user_exit params
|
run_user_exit params
|
||||||
|
|
||||||
[ -d /usr/share/shorewall-pl ] && set +a
|
[ -d /usr/share/shorewall-perl ] && set +a
|
||||||
|
|
||||||
config=$(find_file shorewall.conf)
|
config=$(find_file shorewall.conf)
|
||||||
|
|
||||||
@ -1962,7 +1962,7 @@ do_initialize() {
|
|||||||
TC_EXPERT=$(added_param_value_no TC_EXPERT $TC_EXPERT)
|
TC_EXPERT=$(added_param_value_no TC_EXPERT $TC_EXPERT)
|
||||||
USE_ACTIONS=$(added_param_value_yes USE_ACTIONS $USE_ACTIONS)
|
USE_ACTIONS=$(added_param_value_yes USE_ACTIONS $USE_ACTIONS)
|
||||||
EXPORTPARAMS=$(added_param_value_yes EXPORTPARAMS $EXPORTPARAMS)
|
EXPORTPARAMS=$(added_param_value_yes EXPORTPARAMS $EXPORTPARAMS)
|
||||||
SHOREWALL_PL=$(added_param_value_no SHOREWALL_PL $SHOREWALL_PL)
|
SHOREWALL_PERL=$(added_param_value_no SHOREWALL_PERL $SHOREWALL_PERL)
|
||||||
|
|
||||||
[ -n "$USE_ACTIONS" ] && lib_load actions "USE_ACTIONS=Yes"
|
[ -n "$USE_ACTIONS" ] && lib_load actions "USE_ACTIONS=Yes"
|
||||||
|
|
||||||
|
@ -26,10 +26,10 @@ VERBOSITY=1
|
|||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
# P E R L - B A S E D C O M P I L E R
|
# P E R L - B A S E D C O M P I L E R
|
||||||
# (setting this to Yes requires installation of Shorewall-pl)
|
# (setting this to Yes requires installation of Shorewall-perl)
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
SHOREWALL_PL=No
|
SHOREWALL_PERL=No
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
# L O G G I N G
|
# L O G G I N G
|
||||||
|
Loading…
x
Reference in New Issue
Block a user