From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
install/apps/bastille-firewall | 9 +--------
1 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/install/apps/bastille-firewall b/install/apps/bastille-firewall
index 86da005..d5723db 100644
--- a/install/apps/bastille-firewall
+++ b/install/apps/bastille-firewall
@@ -58,7 +58,7 @@
### END INIT INFO
-REALSCRIPT=/sbin/bastille-ipchains
+REALSCRIPT=/sbin/bastille-netfilter
PATH=/sbin:/bin:/usr/sbin:/usr/bin
# exit function to be called in place of regular Bourne exit
@@ -76,13 +76,6 @@
echo "ERROR: bastille-firewall currently being reset or lock is stuck."
echo "To un-stick, remove the directory /var/lock/bastille-firewall"
exit 1
-fi
-
-if [ -n "$(uname -r | awk -F. ' $1 == 2 && $2 > 2 {print}')" ]; then
- # We are using Linux 2.3 or newer; use the netfilter script if available
- if [ -x /sbin/bastille-netfilter ]; then
- REALSCRIPT=/sbin/bastille-netfilter
- fi
fi
if [ ! -x ${REALSCRIPT} ]; then
--
Gitblit v1.9.1