holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Correct default setting of CONFDIR when .shorewallrc is not found

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-03-28 06:28:53 -07:00
parent 416f854311
commit 0d19c99699
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall-lite/shorewall-lite
View File

@ -39,7 +39,7 @@ elif - -f ${SHOREWALLRC_HOME}/.shorewallrc; then
. ${SHOREWALLRC_HOME}/.shorewallrc || exit 1 . ${SHOREWALLRC_HOME}/.shorewallrc || exit 1
else else
SHAREDIR=/usr/share SHAREDIR=/usr/share
CONFDIR=${CONFDIR} CONFDIR=/etc
SBINDIR=/sbin SBINDIR=/sbin
VARDIR=/var/lib VARDIR=/var/lib
LIBEXECDIR=/usr/share LIBEXECDIR=/usr/share

2
Shorewall/shorewall
View File

@ -39,7 +39,7 @@ elif - -f ${SHOREAWLLRC_HOME}/.shorewallrc; then
. ${SHOREWALLRC_HOME}/.shorewallrc || exit 1 . ${SHOREWALLRC_HOME}/.shorewallrc || exit 1
else else
SHAREDIR=/usr/share SHAREDIR=/usr/share
CONFDIR=${CONFDIR} CONFDIR=/etc
SBINDIR=/sbin SBINDIR=/sbin
VARDIR=/var/lib VARDIR=/var/lib
LIBEXECDIR=/usr/share LIBEXECDIR=/usr/share

2
Shorewall6-lite/shorewall6-lite
View File

@ -39,7 +39,7 @@ elif - -f ${SHOREWALLRC_HOME}/.shorewallrc; then
. ${SHOREWALLRC_HOME}/.shorewallrc || exit 1 . ${SHOREWALLRC_HOME}/.shorewallrc || exit 1
else else
SHAREDIR=/usr/share SHAREDIR=/usr/share
CONFDIR=${CONFDIR} CONFDIR=/etc
SBINDIR=/sbin SBINDIR=/sbin
VARDIR=/var/lib VARDIR=/var/lib
LIBEXECDIR=/usr/share LIBEXECDIR=/usr/share

2
Shorewall6/shorewall6
View File

@ -31,7 +31,7 @@ if [ -f ~/.shorewallrc ]; then
. ~/.shorewallrc || exit 1 . ~/.shorewallrc || exit 1
else else
SHAREDIR=/usr/share SHAREDIR=/usr/share
CONFDIR=${CONFDIR} CONFDIR=/etc
SBINDIR=/sbin SBINDIR=/sbin
VARDIR=/var/lib VARDIR=/var/lib
LIBEXECDIR=/usr/share LIBEXECDIR=/usr/share