From f1643fffb4d368af44eef27ff3df5b0140aa15e9 Mon Sep 17 00:00:00 2001 From: teastep Date: Tue, 20 Mar 2007 21:24:05 +0000 Subject: [PATCH] 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 --- Shorewall/lib.config | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Shorewall/lib.config b/Shorewall/lib.config index 602023e84..b98cffb10 100644 --- a/Shorewall/lib.config +++ b/Shorewall/lib.config @@ -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=