From 68151a767f1baa74cc034b141a07f80f054aabc6 Mon Sep 17 00:00:00 2001 From: teastep Date: Fri, 16 Apr 2004 17:12:02 +0000 Subject: [PATCH] Fix ensure_config_path call git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1264 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall2/changelog.txt | 2 ++ Shorewall2/firewall | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Shorewall2/changelog.txt b/Shorewall2/changelog.txt index 1f401bcfa..56d978dbf 100644 --- a/Shorewall2/changelog.txt +++ b/Shorewall2/changelog.txt @@ -13,3 +13,5 @@ Changes since 2.0.1 6) Restore logic to make 'find_file' check for SHOREWALL_DIR separately. 7) Allow CONFIG_PATH to be inherited. + +8) Fix ensure_config_path call. diff --git a/Shorewall2/firewall b/Shorewall2/firewall index fd323736b..ab3e364b8 100755 --- a/Shorewall2/firewall +++ b/Shorewall2/firewall @@ -5711,8 +5711,6 @@ do_initialize() { BRIDGING= DYNAMIC_ZONES= - ensure_config_path - stopping= have_mutex= masq_seq=1 @@ -5735,6 +5733,8 @@ do_initialize() { startup_error "$FUNCTIONS does not exist!" fi + ensure_config_path + VERSION_FILE=$SHARED_DIR/version [ -f $VERSION_FILE ] && version=$(cat $VERSION_FILE)