extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-12-24 15:18:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Restore the ability to use a params file with the perl compiler

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5627 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-03-22 17:58:25 +00:00
parent b0030d80d9
commit 67e7369303
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Shorewall/lib.config
View File

@ -1732,7 +1732,8 @@ do_initialize() {
USE_ACTIONS= USE_ACTIONS=
OPTIMIZE= OPTIMIZE=
EXPORTPARAMS= EXPORTPARAMS=
EXPERIMENTAL= #EXPERIMENTAL is inherited
# #
# Packet Disposition # Packet Disposition
# #
@ -1786,8 +1787,12 @@ do_initialize() {
[ -f $VERSION_FILE ] && VERSION=$(cat $VERSION_FILE) [ -f $VERSION_FILE ] && VERSION=$(cat $VERSION_FILE)
[ -n "$EXPERIMENTAL" ] && set -a;
run_user_exit params run_user_exit params
[ -n "$EXPERIMENTAL" ] && set +a && EXPERIMENTAL=
config=$(find_file shorewall.conf) config=$(find_file shorewall.conf)
if [ -f $config ]; then if [ -f $config ]; then

10
Shorewall/shorewall
View File

@ -214,6 +214,16 @@ get_config() {
[ -n "${HOSTNAME:=$(hostname)}" ] [ -n "${HOSTNAME:=$(hostname)}" ]
case "$EXPERIMENTAL" in
yes|Yes)
;;
*)
EXPERIMENTAL=
;;
esac
export EXPERIMENTAL;
} }
# #