From d246bedab8e4a6f36cc57fc1df44dd62e8fd3ccf Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Thu, 14 Mar 2013 11:04:26 -0700 Subject: [PATCH] Install the routes file unless $SPARSE - Don't delete the file unconditionally. Signed-off-by: Tom Eastep --- Shorewall/install.sh | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/Shorewall/install.sh b/Shorewall/install.sh index 5ce63ca9c..f53d21bf5 100755 --- a/Shorewall/install.sh +++ b/Shorewall/install.sh @@ -742,10 +742,6 @@ if [ -f findgw ]; then fi fi -# -# Delete the Routes file -# -delete_file ${DESTDIR}${CONFDIR}/$PRODUCT/routes # # Delete the tcstart file # @@ -989,6 +985,17 @@ if [ -z "$SPARSE" -a ! -f ${DESTDIR}${CONFDIR}/$PRODUCT/actions ]; then echo "Actions file installed as ${DESTDIR}${CONFDIR}/$PRODUCT/actions" fi +# +# Install the Routes file +# +run_install $OWNERSHIP -m 0644 routes ${DESTDIR}${SHAREDIR}/$PRODUCT/configfiles/ +run_install $OWNERSHIP -m 0644 routes.annotated ${DESTDIR}${SHAREDIR}/$PRODUCT/configfiles/ + +if [ -z "$SPARSE" -a ! -f ${DESTDIR}${CONFDIR}/$PRODUCT/routes ]; then + run_install $OWNERSHIP -m 0644 routes${suffix} ${DESTDIR}${CONFDIR}/$PRODUCT/routes + echo "Routes file installed as ${DESTDIR}${CONFDIR}/$PRODUCT/routes" +fi + cd .. #