forked from extern/shorewall_code
Restore the ability to use a params file with the perl compiler
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5627 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
b0030d80d9
commit
67e7369303
@ -1732,7 +1732,8 @@ do_initialize() {
|
||||
USE_ACTIONS=
|
||||
OPTIMIZE=
|
||||
EXPORTPARAMS=
|
||||
EXPERIMENTAL=
|
||||
#EXPERIMENTAL is inherited
|
||||
|
||||
#
|
||||
# Packet Disposition
|
||||
#
|
||||
@ -1786,8 +1787,12 @@ do_initialize() {
|
||||
|
||||
[ -f $VERSION_FILE ] && VERSION=$(cat $VERSION_FILE)
|
||||
|
||||
[ -n "$EXPERIMENTAL" ] && set -a;
|
||||
|
||||
run_user_exit params
|
||||
|
||||
[ -n "$EXPERIMENTAL" ] && set +a && EXPERIMENTAL=
|
||||
|
||||
config=$(find_file shorewall.conf)
|
||||
|
||||
if [ -f $config ]; then
|
||||
|
@ -214,6 +214,16 @@ get_config() {
|
||||
|
||||
[ -n "${HOSTNAME:=$(hostname)}" ]
|
||||
|
||||
case "$EXPERIMENTAL" in
|
||||
yes|Yes)
|
||||
;;
|
||||
*)
|
||||
EXPERIMENTAL=
|
||||
;;
|
||||
esac
|
||||
|
||||
export EXPERIMENTAL;
|
||||
|
||||
}
|
||||
|
||||
#
|
||||
|
Loading…
Reference in New Issue
Block a user