mirror of
https://gitlab.com/shorewall/code.git
synced 2025-01-05 13:08:50 +01:00
Fix ensure_config_path call
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1264 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
e765bc1cef
commit
68151a767f
@ -13,3 +13,5 @@ Changes since 2.0.1
|
|||||||
6) Restore logic to make 'find_file' check for SHOREWALL_DIR separately.
|
6) Restore logic to make 'find_file' check for SHOREWALL_DIR separately.
|
||||||
|
|
||||||
7) Allow CONFIG_PATH to be inherited.
|
7) Allow CONFIG_PATH to be inherited.
|
||||||
|
|
||||||
|
8) Fix ensure_config_path call.
|
||||||
|
@ -5711,8 +5711,6 @@ do_initialize() {
|
|||||||
BRIDGING=
|
BRIDGING=
|
||||||
DYNAMIC_ZONES=
|
DYNAMIC_ZONES=
|
||||||
|
|
||||||
ensure_config_path
|
|
||||||
|
|
||||||
stopping=
|
stopping=
|
||||||
have_mutex=
|
have_mutex=
|
||||||
masq_seq=1
|
masq_seq=1
|
||||||
@ -5735,6 +5733,8 @@ do_initialize() {
|
|||||||
startup_error "$FUNCTIONS does not exist!"
|
startup_error "$FUNCTIONS does not exist!"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
ensure_config_path
|
||||||
|
|
||||||
VERSION_FILE=$SHARED_DIR/version
|
VERSION_FILE=$SHARED_DIR/version
|
||||||
|
|
||||||
[ -f $VERSION_FILE ] && version=$(cat $VERSION_FILE)
|
[ -f $VERSION_FILE ] && version=$(cat $VERSION_FILE)
|
||||||
|
Loading…
Reference in New Issue
Block a user