From 9749b617efbffa6a314c44c3e36c96b78daef256 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Mon, 4 Dec 2006 16:31:48 +0000
Subject: [PATCH] Allow 'capabilities' file to be used with Shorewall

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5046 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall/changelog.txt    |  3 +++
 Shorewall/lib.config       |  5 ++++-
 Shorewall/releasenotes.txt | 13 +++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt
index 33248ed77..c1ee9a5e4 100644
--- a/Shorewall/changelog.txt
+++ b/Shorewall/changelog.txt
@@ -18,6 +18,9 @@ Changes in 3.3.6
 
 9)  Restore 'try' command and improve 'safe-' commands.
 
+10) Allow capabilities file to be used with Shorewall as well as
+    Shorewall Lite.
+
 Changes in 3.3.5
 
 1)  Restore default route when there are no 'balance' providers.
diff --git a/Shorewall/lib.config b/Shorewall/lib.config
index c0d0d4a21..ae948fae6 100644
--- a/Shorewall/lib.config
+++ b/Shorewall/lib.config
@@ -1869,7 +1869,10 @@ do_initialize() {
 	else
 	    [ -e "$IPTABLES" ] || fatal_error "\$IPTABLES=$IPTABLES does not exist or is not executable"
 	fi
-	determine_capabilities
+	
+	f=$(find_file capabilities)
+
+	if [ -f $f ] && . $f || determine_capabilities
 
     else
 	f=$(find_file capabilities)
diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt
index 34934965c..8b3f3659b 100644
--- a/Shorewall/releasenotes.txt
+++ b/Shorewall/releasenotes.txt
@@ -114,6 +114,19 @@ Other Changes in 3.3.6
     which is equivalent to
 
         export firewall2
+
+8)  Shorewall commands may be speeded up slightly by using a
+    'capabilities' file. The 'capabilities' file was originally
+    designed for use with Shorewall Lite and records the
+    iptables/Netfilter features available on the target system.
+
+    To generate a capabilities file, execute the following command as
+    root:
+
+      shorewall show -f capabilities > /etc/shorewall/capabilities
+
+    When you install a new kernel and/or iptables, be sure to generate
+    a new file.
 	
 Migration Considerations: