From 3581b2667e3eb71299a0771a8d0112616783e1c6 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sun, 27 Nov 2011 14:39:59 -0800 Subject: [PATCH] Don't install the blacklist file in /etc/shorewall[6] Signed-off-by: Tom Eastep --- Shorewall/install.sh | 5 ----- Shorewall6/install.sh | 5 ----- 2 files changed, 10 deletions(-) diff --git a/Shorewall/install.sh b/Shorewall/install.sh index c87220ec4..7bba5ed7e 100755 --- a/Shorewall/install.sh +++ b/Shorewall/install.sh @@ -605,11 +605,6 @@ if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall/tunnels ]; then run_install $OWNERSHIP -m 0600 configfiles/tunnels${suffix} ${DESTDIR}/etc/shorewall/tunnels echo "Tunnels file installed as ${DESTDIR}/etc/shorewall/tunnels" fi -# -# Install the blacklist file -# -run_install $OWNERSHIP -m 0644 configfiles/blacklist ${DESTDIR}/usr/share/shorewall/configfiles -run_install $OWNERSHIP -m 0644 configfiles/blacklist.annotated ${DESTDIR}/usr/share/shorewall/configfiles if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall/blacklist ]; then run_install $OWNERSHIP -m 0600 configfiles/blacklist${suffix} ${DESTDIR}/etc/shorewall/blacklist diff --git a/Shorewall6/install.sh b/Shorewall6/install.sh index 394c83b62..d22fcff8a 100755 --- a/Shorewall6/install.sh +++ b/Shorewall6/install.sh @@ -575,11 +575,6 @@ if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall6/tunnels ]; then run_install $OWNERSHIP -m 0600 tunnels${suffix} ${DESTDIR}/etc/shorewall6/tunnels echo "Tunnels file installed as ${DESTDIR}/etc/shorewall6/tunnels" fi -# -# Install the blacklist file -# -run_install $OWNERSHIP -m 0644 blacklist ${DESTDIR}/usr/share/shorewall6/configfiles/ -run_install $OWNERSHIP -m 0644 blacklist.annotated ${DESTDIR}/usr/share/shorewall6/configfiles/ if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall6/blacklist ]; then run_install $OWNERSHIP -m 0600 blacklist${suffix} ${DESTDIR}/etc/shorewall6/blacklist