From 4fcfa80018de093a8403676b5e161cf77f7a3a84 Mon Sep 17 00:00:00 2001
From: el_cubano <el_cubano@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sun, 21 Oct 2007 20:50:28 +0000
Subject: [PATCH] Remove confusing default option.

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@7494 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall-common/default.debian |  6 ++----
 Shorewall-lite/default.debian   |  6 ++----
 Shorewall-shell/compiler        | 16 +++++++++-------
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/Shorewall-common/default.debian b/Shorewall-common/default.debian
index f66f56dee..26b99e8f8 100644
--- a/Shorewall-common/default.debian
+++ b/Shorewall-common/default.debian
@@ -16,11 +16,9 @@ startup=0
 #    wait_interface=
 
 #
-# Startup options -- if you specify '-f' then Shorewall will use the last saved
-#                    configuration if any; this is much faster than parsing the
-#                    configuration files.
+# Startup options
 #
 
-OPTIONS="-f"
+OPTIONS=""
 
 # EOF
diff --git a/Shorewall-lite/default.debian b/Shorewall-lite/default.debian
index 8593d6b63..375b3efcb 100644
--- a/Shorewall-lite/default.debian
+++ b/Shorewall-lite/default.debian
@@ -14,11 +14,9 @@ startup=0
 #    wait_interface="ppp0 ppp1"
 
 #
-# Startup options -- if you specify '-f' then Shorewall will use the last saved
-#                    configuration if any; this is much faster than parsing the
-#                    configuration files.
+# Startup options
 #
 
-OPTIONS="-f"
+OPTIONS=""
 
 # EOF
diff --git a/Shorewall-shell/compiler b/Shorewall-shell/compiler
index 91aa6f772..2454daf61 100755
--- a/Shorewall-shell/compiler
+++ b/Shorewall-shell/compiler
@@ -17,9 +17,9 @@
 #	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 #	GNU General Public License for more details.
 #
-#	You should have received a copy of the GNU General Public License
-#	along with this program; if not, write to the Free Software
-#	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#	You should have received a copy of the GNU General Public License along
+#	with this program; if not, write to the Free Software Foundation, Inc.,
+#	51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 #	If an error occurs while starting or restarting the firewall, the
 #	firewall is automatically stopped.
@@ -53,9 +53,10 @@ fatal_error() # $* = Error Message
 }
 
 #
-# We include this for compatibility with the 'firewall' script. That script distinguishes between
-# Fatal Errors (stop or restore required) and Startup Errors (errors detected before the firewall
-# state has been changed. This allows us to use common parsing routines in both programs.
+# We include this for compatibility with the 'firewall' script. That script
+# distinguishes between Fatal Errors (stop or restore required) and Startup
+# Errors (errors detected before the firewall state has been changed. This
+# allows us to use common parsing routines in both programs.
 #
 startup_error()
 {
@@ -112,7 +113,8 @@ indent() {
 }
 
 #
-# Echo the contents of the passed file indented by $INDENT while handling line continuation
+# Echo the contents of the passed file indented by $INDENT while handling line
+# continuation
 #
 indent1() {
     if [ -n "$INDENT" ]; then