Correct all configpath files.

Signed-off-by: Tom Eastep <teastep@shorewall.net>

Conflicts:
	Shorewall/configpath
This commit is contained in:
Tom Eastep 2013-02-14 15:10:21 -08:00
parent a6d6cc9da7
commit 4b01b42c34
4 changed files with 5 additions and 19 deletions

View File

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

View File

@ -3,11 +3,4 @@
#
# /usr/share/shorewall/configpath
#
# Note to maintainers.
#
# The CONFDIR variable is normally set to /etc/shorewall but when
# the command is "compile -e" then CONFDIR is set to
# /usr/share/shorewall/configfiles/. This prevents 'compile -e'
# from trying to use configuration information from /etc/shorewall.
CONFIG_PATH=${CONFDIR}:${SHAREDIR}/shorewall
CONFIG_PATH=${CONFDIR}/shorewall:${SHAREDIR}/shorewall

View File

@ -1,7 +1,7 @@
#
# Shorewall Lite version 4.1 - Default Config Path
# Shorewall6 Lite version 4.1 - Default Config Path
#
# /usr/share/shorewall-lite/configpath
#
CONFIG_PATH=/etc/shorewall-lite:/usr/share/shorewall-lite
CONFIG_PATH=${CONFDIR}/shorewall-lite:${SHAREDIR}/shorewall6-lite:${SHAREDIR}/shorewall

View File

@ -3,11 +3,4 @@
#
# /usr/share/shorewall6/configpath
#
# Note to maintainers.
#
# The CONFDIR variable is normally set to /etc/shorewall6 but when
# the command is "compile -e" then CONFDIR is set to
# /usr/share/shorewall6/configfiles/. This prevents 'compile -e'
# from trying to use configuration information from /etc/shorewall.
CONFIG_PATH=${CONFDIR}:/usr/share/shorewall6:/usr/share/shorewall
CONFIG_PATH=${CONFDIR}/shorewall6:${SHAREDIR}/shorewall6:${SHAREDIR}/shorewall