diff --git a/Shorewall/compiler b/Shorewall/compiler index c77ee3881..9d95dd1a5 100755 --- a/Shorewall/compiler +++ b/Shorewall/compiler @@ -5668,13 +5668,13 @@ case "$COMMAND" in check) [ $# -ne 1 ] && usage 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) [ $# -ne 2 ] && usage 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) diff --git a/Shorewall/lib.config b/Shorewall/lib.config index 3c0133e7a..e969cc8e8 100644 --- a/Shorewall/lib.config +++ b/Shorewall/lib.config @@ -1787,11 +1787,11 @@ do_initialize() { [ -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 - [ -d /usr/share/shorewall-pl ] && set +a + [ -d /usr/share/shorewall-perl ] && set +a config=$(find_file shorewall.conf) @@ -1962,7 +1962,7 @@ do_initialize() { TC_EXPERT=$(added_param_value_no TC_EXPERT $TC_EXPERT) USE_ACTIONS=$(added_param_value_yes USE_ACTIONS $USE_ACTIONS) 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" diff --git a/Shorewall/shorewall.conf b/Shorewall/shorewall.conf index 0df8ff547..b8980c32d 100644 --- a/Shorewall/shorewall.conf +++ b/Shorewall/shorewall.conf @@ -26,10 +26,10 @@ VERBOSITY=1 ############################################################################### # 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