From 8c53fa175cfc43213b446d66bf93a23f675c8d3c Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Wed, 13 Mar 2013 11:17:10 -0700
Subject: [PATCH 1/2] Update action tables in Shorewall-init article

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 docs/Shorewall-init.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/docs/Shorewall-init.xml b/docs/Shorewall-init.xml
index 029d4339d..7b6a66787 100644
--- a/docs/Shorewall-init.xml
+++ b/docs/Shorewall-init.xml
@@ -208,6 +208,14 @@
             <entry>start</entry>
           </row>
 
+          <row>
+            <entry>started</entry>
+
+            <entry>Optional</entry>
+
+            <entry>enable</entry>
+          </row>
+
           <row>
             <entry>started</entry>
 
@@ -248,6 +256,14 @@
             <entry>start</entry>
           </row>
 
+          <row>
+            <entry>started</entry>
+
+            <entry>Optional</entry>
+
+            <entry>enable</entry>
+          </row>
+
           <row>
             <entry>started</entry>
 

From 276382605935028e02d94cdf3d1f2d9defa2928f Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Thu, 14 Mar 2013 14:03:05 -0700
Subject: [PATCH 2/2] Install the routes file unless $SPARSE

- Don't delete the file unconditionally.
- Delete an unhelpful comment

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall/install.sh | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/Shorewall/install.sh b/Shorewall/install.sh
index 5ce63ca9c..ffdeac4e6 100755
--- a/Shorewall/install.sh
+++ b/Shorewall/install.sh
@@ -102,9 +102,6 @@ require()
 
 cd "$(dirname $0)"
 
-#
-# Load packager's settings if any
-#
 if [ -f shorewall ]; then
     PRODUCT=shorewall
     Product=Shorewall
@@ -742,10 +739,6 @@ if [ -f findgw ]; then
     fi
 fi
 
-#
-# Delete the Routes file
-#
-delete_file ${DESTDIR}${CONFDIR}/$PRODUCT/routes
 #
 # Delete the tcstart file
 #
@@ -989,6 +982,17 @@ if [ -z "$SPARSE" -a ! -f ${DESTDIR}${CONFDIR}/$PRODUCT/actions ]; then
     echo "Actions file installed as ${DESTDIR}${CONFDIR}/$PRODUCT/actions"
 fi
 
+#
+# Install the Routes file
+#
+run_install $OWNERSHIP -m 0644 routes           ${DESTDIR}${SHAREDIR}/$PRODUCT/configfiles/
+run_install $OWNERSHIP -m 0644 routes.annotated ${DESTDIR}${SHAREDIR}/$PRODUCT/configfiles/
+
+if [ -z "$SPARSE" -a ! -f ${DESTDIR}${CONFDIR}/$PRODUCT/routes ]; then
+    run_install $OWNERSHIP -m 0644 routes${suffix} ${DESTDIR}${CONFDIR}/$PRODUCT/routes
+    echo "Routes file installed as ${DESTDIR}${CONFDIR}/$PRODUCT/routes"
+fi
+
 cd ..
 
 #