extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-03 08:25:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow CONFIG_PATH to be inherited

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1261 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2004-04-13 17:15:15 +00:00
parent be524997f1
commit 91337c3dcb
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall2/changelog.txt
View File

@ -11,3 +11,5 @@ Changes since 2.0.1
5) Apply Stijn Jonker's fix for CONFIG_PATH. 5) Apply Stijn Jonker's fix for CONFIG_PATH.
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.

2
Shorewall2/firewall
View File

@ -5710,7 +5710,7 @@ do_initialize() {
DISABLE_IPV6= DISABLE_IPV6=
BRIDGING= BRIDGING=
DYNAMIC_ZONES= DYNAMIC_ZONES=
CONFIG_PATH=/etc/shorewall:/usr/share/shorewall [ -n "$CONFIG_PATH" ] || CONFIG_PATH=/etc/shorewall:/usr/share/shorewall
stopping= stopping=
have_mutex= have_mutex=

6
Shorewall2/shorewall
View File

@ -631,7 +631,7 @@ FIREWALL=$SHARED_DIR/firewall
FUNCTIONS=$SHARED_DIR/functions FUNCTIONS=$SHARED_DIR/functions
VERSION_FILE=$SHARED_DIR/version VERSION_FILE=$SHARED_DIR/version
HELP=$SHARED_DIR/help HELP=$SHARED_DIR/help
CONFIG_PATH=/etc/shorewall:/usr/share/shorewall [ -n "$CONFIG_PATH" ] || CONFIG_PATH=/etc/shorewall:/usr/share/shorewall
if [ -f $FUNCTIONS ]; then if [ -f $FUNCTIONS ]; then
. $FUNCTIONS . $FUNCTIONS
@ -649,7 +649,9 @@ else
exit 2 exit 2
fi fi
[ -z "$CONFIG_PATH" ] && CONFIG_PATH=/etc/shorewall:/usr/share/shorewall [ -n "$CONFIG_PATH" ] || CONFIG_PATH=/etc/shorewall:/usr/share/shorewall
export CONFIG_PATH
[ -z "${STATEDIR}" ] && STATEDIR=/var/state/shorewall [ -z "${STATEDIR}" ] && STATEDIR=/var/state/shorewall