Fix a couple of problems in Shorewall-init

- Remove fly speck from installer
- Don't bother to save/restore VARDIR

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-06-01 08:10:41 -07:00
parent 02006288b0
commit 70e6bda3bb
2 changed files with 1 additions and 7 deletions

View File

@ -187,11 +187,6 @@ else
fi fi
for PRODUCT in $PRODUCTS; do for PRODUCT in $PRODUCTS; do
#
# For backward compatibility, lib.base appends the product name to VARDIR
# Save it here and restore it below
#
save_vardir=${VARDIR}
if [ -x $VARDIR/$PRODUCT/firewall ]; then if [ -x $VARDIR/$PRODUCT/firewall ]; then
( g_program=$PRODUCT ( g_program=$PRODUCT
g_readrc= g_readrc=
@ -202,7 +197,6 @@ for PRODUCT in $PRODUCTS; do
mutex_off mutex_off
) )
fi fi
VARDIR=${save_vardir}
done done
exit 0 exit 0

View File

@ -347,7 +347,7 @@ fi
cp ifupdown.sh ifupdown cp ifupdown.sh ifupdown
d[ "${SHAREDIR}" = /usr/share ] || eval sed -i \'s\|/usr/share/\|${SHAREDIR}/\|\' ifupdown [ "${SHAREDIR}" = /usr/share ] || eval sed -i \'s\|/usr/share/\|${SHAREDIR}/\|\' ifupdown
mkdir -p ${DESTDIR}${LIBEXECDIR}/shorewall-init mkdir -p ${DESTDIR}${LIBEXECDIR}/shorewall-init