From 7edf4918d736c9c10983f5815fe24b6bd7796e05 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Tue, 26 Dec 2017 10:27:19 -0800 Subject: [PATCH] Remove leading ":" from CONFIG_PATH in active shorewall[6].conf Signed-off-by: Tom Eastep --- Shorewall/install.sh | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Shorewall/install.sh b/Shorewall/install.sh index 917fb619a..624e6f3d7 100755 --- a/Shorewall/install.sh +++ b/Shorewall/install.sh @@ -506,13 +506,7 @@ fi if [ ! -f ${DESTDIR}${CONFDIR}/$PRODUCT/$PRODUCT.conf ]; then run_install $OWNERSHIP -m 0600 ${PRODUCT}.conf${suffix} ${DESTDIR}${CONFDIR}/$PRODUCT/$PRODUCT.conf - if [ "$SHAREDIR" != /usr/share -o "$CONFDIR" != /etc ]; then - if [ $PRODUCT = shorewall ]; then - perl -p -w -i -e "s|^CONFIG_PATH=.*|CONFIG_PATH=${CONFDIR}/shorewall:${SHAREDIR}/shorewall|;" ${DESTDIR}${CONFDIR}/$PRODUCT/$PRODUCT.conf - else - perl -p -w -i -e "s|^CONFIG_PATH=.*|CONFIG_PATH=${CONFDIR}/shorewall:${SHAREDIR}/shorewall6:${SHAREDIR}/shorewall|;" ${DESTDIR}${CONFDIR}/$PRODUCT/$PRODUCT.conf - fi - fi + perl -p -w -i -e 's|CONFIG_PATH=:/CONFIG_PATH=/' ${DESTDIR}${CONFDIR}/$PRODUCT/$PRODUCT.conf if [ $HOST = archlinux ] ; then sed -e 's!LOGFILE=/var/log/messages!LOGFILE=/var/log/messages.log!' -i ${DESTDIR}${CONFDIR}/$PRODUCT/$PRODUCT.conf