Allow params file to work with Perl-based Compiler

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5600 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-03-20 21:24:05 +00:00
parent 3c614a70d9
commit f1643fffb4

View File

@ -1849,8 +1849,14 @@ do_initialize() {
[ -f $VERSION_FILE ] && VERSION=$(cat $VERSION_FILE)
EXPERIMENTAL=$(added_param_value_no EXPERIMENTAL $EXPERIMENTAL)
[ -n "$EXPERIMENTAL" ] && set -a
run_user_exit params
[ -n "$EXPERIMENTAL" ] && set +a
config=$(find_file shorewall.conf)
if [ -f $config ]; then
@ -2020,7 +2026,6 @@ 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)
EXPERIMENTAL=$(added_param_value_no EXPERIMENTAL $EXPERIMENTAL)
[ -n "$USE_ACTIONS" ] && lib_load actions "USE_ACTIONS=Yes"
[ -n "$XCONNMARK_MATCH" ] || XCONNMARK=