From 0d19c99699ea7d6285066cbffa94063e391bfcaf Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Wed, 28 Mar 2012 06:28:53 -0700 Subject: [PATCH] Correct default setting of CONFDIR when .shorewallrc is not found Signed-off-by: Tom Eastep --- Shorewall-lite/shorewall-lite | 2 +- Shorewall/shorewall | 2 +- Shorewall6-lite/shorewall6-lite | 2 +- Shorewall6/shorewall6 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Shorewall-lite/shorewall-lite b/Shorewall-lite/shorewall-lite index 399bcc22d..7b824a320 100755 --- a/Shorewall-lite/shorewall-lite +++ b/Shorewall-lite/shorewall-lite @@ -39,7 +39,7 @@ elif - -f ${SHOREWALLRC_HOME}/.shorewallrc; then . ${SHOREWALLRC_HOME}/.shorewallrc || exit 1 else SHAREDIR=/usr/share - CONFDIR=${CONFDIR} + CONFDIR=/etc SBINDIR=/sbin VARDIR=/var/lib LIBEXECDIR=/usr/share diff --git a/Shorewall/shorewall b/Shorewall/shorewall index 808b4b731..b7bc7b810 100755 --- a/Shorewall/shorewall +++ b/Shorewall/shorewall @@ -39,7 +39,7 @@ elif - -f ${SHOREAWLLRC_HOME}/.shorewallrc; then . ${SHOREWALLRC_HOME}/.shorewallrc || exit 1 else SHAREDIR=/usr/share - CONFDIR=${CONFDIR} + CONFDIR=/etc SBINDIR=/sbin VARDIR=/var/lib LIBEXECDIR=/usr/share diff --git a/Shorewall6-lite/shorewall6-lite b/Shorewall6-lite/shorewall6-lite index 76cb4085e..a1291267d 100755 --- a/Shorewall6-lite/shorewall6-lite +++ b/Shorewall6-lite/shorewall6-lite @@ -39,7 +39,7 @@ elif - -f ${SHOREWALLRC_HOME}/.shorewallrc; then . ${SHOREWALLRC_HOME}/.shorewallrc || exit 1 else SHAREDIR=/usr/share - CONFDIR=${CONFDIR} + CONFDIR=/etc SBINDIR=/sbin VARDIR=/var/lib LIBEXECDIR=/usr/share diff --git a/Shorewall6/shorewall6 b/Shorewall6/shorewall6 index 329f84f26..a1e3e50d0 100755 --- a/Shorewall6/shorewall6 +++ b/Shorewall6/shorewall6 @@ -31,7 +31,7 @@ if [ -f ~/.shorewallrc ]; then . ~/.shorewallrc || exit 1 else SHAREDIR=/usr/share - CONFDIR=${CONFDIR} + CONFDIR=/etc SBINDIR=/sbin VARDIR=/var/lib LIBEXECDIR=/usr/share