From 0ee498f4f119acbdb6a07b8937fd61ca142d48cd Mon Sep 17 00:00:00 2001
From: el_cubano <el_cubano@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sat, 26 Apr 2008 04:28:55 +0000
Subject: [PATCH] Fix Debian init script to use the value of OPTIONS from the
 defaults file.

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@8478 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall-common/changelog.txt    | 2 ++
 Shorewall-common/init.debian.sh   | 3 ++-
 Shorewall-common/releasenotes.txt | 5 +++++
 Shorewall-lite/default.debian     | 8 ++++----
 Shorewall-lite/init.debian.sh     | 1 +
 5 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/Shorewall-common/changelog.txt b/Shorewall-common/changelog.txt
index 2889c17e0..1ae2d7a7a 100644
--- a/Shorewall-common/changelog.txt
+++ b/Shorewall-common/changelog.txt
@@ -36,6 +36,8 @@ Changes in 4.1.7
 
 14) Fix IPSEC host entry with DYNAMIC_ZONES=Yes
 
+15) Use the OPTIONS variable from /etc/default/shorewall[-lite] on Debian.
+
 Changes in 4.1.6
 
 1)  Deprecate IMPLICIT_CONTINUE=Yes
diff --git a/Shorewall-common/init.debian.sh b/Shorewall-common/init.debian.sh
index 0f672e781..215472a12 100755
--- a/Shorewall-common/init.debian.sh
+++ b/Shorewall-common/init.debian.sh
@@ -59,6 +59,7 @@ not_configured () {
 if [ -f "/etc/default/shorewall" ]
 then
 	. /etc/default/shorewall
+	$SRWL_OPTS+="$OPTIONS"
 	if [ "$startup" != "1" ]
 	then
 		not_configured
@@ -67,7 +68,7 @@ else
 	not_configured
 fi
 
-# wait an unconfigured interface 
+# wait for an unconfigured interface 
 wait_for_pppd () {
 	if [ "$wait_interface" != "" ]
 	then
diff --git a/Shorewall-common/releasenotes.txt b/Shorewall-common/releasenotes.txt
index 13da0f32d..3fb7064fe 100644
--- a/Shorewall-common/releasenotes.txt
+++ b/Shorewall-common/releasenotes.txt
@@ -80,6 +80,11 @@ Problems Corrected in Shorewall 4.1.8
 1)  Changes to your configuration made by NULL_ROUTE_RFC1918=Yes are
     now reversed during 'shorewall stop' and 'shoreawll restart'.
 
+2)  The init script on Debian now reads and utilizes the value of the
+    OPTIONS variable from /etc/default/shorewall[-lite].  Previously,
+    the value of that variable was not passed to the shorewall[-lite]
+    command.
+
 Other Changes in Shoreall 4.1.8.
 
 1)  When using Shorewall-perl, the CEIL and RATE columns must now
diff --git a/Shorewall-lite/default.debian b/Shorewall-lite/default.debian
index 8593d6b63..26b99e8f8 100644
--- a/Shorewall-lite/default.debian
+++ b/Shorewall-lite/default.debian
@@ -12,13 +12,13 @@ startup=0
 #    wait_interface="ppp0"
 # or
 #    wait_interface="ppp0 ppp1"
+# or, if you have defined  in /etc/shorewall/params
+#    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/init.debian.sh b/Shorewall-lite/init.debian.sh
index a1a3cb40d..8ecfe5591 100755
--- a/Shorewall-lite/init.debian.sh
+++ b/Shorewall-lite/init.debian.sh
@@ -66,6 +66,7 @@ fi
 if [ -f "/etc/default/shorewall-lite" ]
 then
 	. /etc/default/shorewall-lite
+	$SRWL_OPTS+="$OPTIONS"
 	if [ "$startup" != "1" ]
 	then
 		not_configured