mirror of
https://gitlab.com/shorewall/code.git
synced 2025-06-23 19:21:21 +02:00
Back out silly change to lib.config
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5625 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
32fea8c9af
commit
07d5629355
@ -1786,14 +1786,8 @@ do_initialize() {
|
|||||||
|
|
||||||
[ -f $VERSION_FILE ] && VERSION=$(cat $VERSION_FILE)
|
[ -f $VERSION_FILE ] && VERSION=$(cat $VERSION_FILE)
|
||||||
|
|
||||||
EXPERIMENTAL=$(added_param_value_no EXPERIMENTAL $EXPERIMENTAL)
|
|
||||||
|
|
||||||
[ -n "$EXPERIMENTAL" ] && set -a
|
|
||||||
|
|
||||||
run_user_exit params
|
run_user_exit params
|
||||||
|
|
||||||
[ -n "$EXPERIMENTAL" ] && set +a
|
|
||||||
|
|
||||||
config=$(find_file shorewall.conf)
|
config=$(find_file shorewall.conf)
|
||||||
|
|
||||||
if [ -f $config ]; then
|
if [ -f $config ]; then
|
||||||
@ -1963,6 +1957,8 @@ 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)
|
||||||
|
EXPERIMENTAL=$(added_param_value_no EXPERIMENTAL $EXPERIMENTAL)
|
||||||
|
|
||||||
[ -n "$USE_ACTIONS" ] && lib_load actions "USE_ACTIONS=Yes"
|
[ -n "$USE_ACTIONS" ] && lib_load actions "USE_ACTIONS=Yes"
|
||||||
|
|
||||||
[ -n "$XCONNMARK_MATCH" ] || XCONNMARK=
|
[ -n "$XCONNMARK_MATCH" ] || XCONNMARK=
|
||||||
|
Loading…
x
Reference in New Issue
Block a user