extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-12 20:56:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Final (I hope) version of PG Patch #2

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4123 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-06-16 22:19:18 +00:00
parent dffe6b47e7
commit 6619bd32d8
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall/compiler
View File

@ -8639,7 +8639,7 @@ do_initialize() {
SHAREDIR=/usr/share/shorewall SHAREDIR=/usr/share/shorewall
VARDIR=/var/lib/shorewall VARDIR=/var/lib/shorewall
CONFDIR=/etc/shorewall [ -z "$EXPORT" ] && CONFDIR=/etc/shorewall || CONFDIR=/usr/share/shorewall/configfiles
FUNCTIONS=${SHAREDIR}/functions FUNCTIONS=${SHAREDIR}/functions

2
Shorewall/configpath
View File

@ -4,4 +4,4 @@
# /usr/share/shorewall/configpath # /usr/share/shorewall/configpath
# #
CONFIG_PATH=/etc/shorewall:/usr/share/shorewall CONFIG_PATH=${CONFDIR}:/usr/share/shorewall

2
Shorewall/functions
View File

@ -248,7 +248,7 @@ find_file()
IFS=$saveifs IFS=$saveifs
[ -z "$EXPORT" ] && echo ${CONFDIR}/$1 || echo ${SHAREDIR}/configfiles/$1 echo ${CONFDIR}/$1
fi fi
;; ;;
esac esac

3
Shorewall/shorewall
View File

@ -194,6 +194,8 @@ get_config() {
if [ -z "$EXPORT" -a "$(whoami)" = root ]; then if [ -z "$EXPORT" -a "$(whoami)" = root ]; then
export CONFIG_PATH
[ -z "$LOGFILE" ] && LOGFILE=/var/log/messages [ -z "$LOGFILE" ] && LOGFILE=/var/log/messages
if [ ! -f $LOGFILE ]; then if [ ! -f $LOGFILE ]; then
@ -1557,7 +1559,6 @@ else
fi fi
ensure_config_path ensure_config_path
export CONFIG_PATH
get_config get_config