extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-11-23 16:13:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove SHARED_DIR from shorewall.conf

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@488 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2003-03-08 17:55:34 +00:00
parent ba123e3eba
commit 6a478754ac
2 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Shorewall/firewall
View File

@ -4303,19 +4303,17 @@ do_initialize() {
trap "rm -rf $TMP_DIR; my_mutex_off; exit 2" 1 2 3 4 5 6 9 trap "rm -rf $TMP_DIR; my_mutex_off; exit 2" 1 2 3 4 5 6 9
if [ -n "$SHOREWALL_DIR" -a -f $SHOREWALL_DIR/params ]; then FUNCTIONS=$SHARED_DIR/functions
params=$SHOREWALL_DIR/params
if [ -f $FUNCTIONS ]; then
. $FUNCTIONS
else else
params=/etc/shorewall/params startup_error "$FUNCTIONS does not exist!"
fi fi
[ -f $params ] && echo "Processing $params..." && . $params run_user_exit params
if [ -n "$SHOREWALL_DIR" -a -f $SHOREWALL_DIR/shorewall.conf ]; then config=`find_file shorewall.conf`
config=$SHOREWALL_DIR/shorewall.conf
else
config=/etc/shorewall/shorewall.conf
fi
if [ -f $config ]; then if [ -f $config ]; then
echo "Processing $config..." echo "Processing $config..."
@ -4325,14 +4323,6 @@ do_initialize() {
exit 2 exit 2
fi fi
FUNCTIONS=$SHARED_DIR/functions
if [ -f $FUNCTIONS ]; then
. $FUNCTIONS
else
startup_error "$FUNCTIONS does not exist!"
fi
VERSION_FILE=$SHARED_DIR/version VERSION_FILE=$SHARED_DIR/version
[ -f $VERSION_FILE ] && version=`cat $VERSION_FILE` [ -f $VERSION_FILE ] && version=`cat $VERSION_FILE`

8
Shorewall/shorewall.conf
View File

@ -8,14 +8,6 @@
# #
# (c) 1999,2000,2001,2002,2003 - Tom Eastep (teastep@shorewall.net) # (c) 1999,2000,2001,2002,2003 - Tom Eastep (teastep@shorewall.net)
############################################################################## ##############################################################################
# D I S T R I B U T I O N - S P E C I F I C S E T T I N G S
##############################################################################
# You should not have to change the variables in this section -- they are set
# by the packager of your Shorewall distribution
#
SHARED_DIR=/usr/share/shorewall
#
##############################################################################
# L O G G I N G # L O G G I N G
############################################################################## ##############################################################################
# #