From 0cd2b6f5cda9cf0f4b7bd6bc5d94c0a19b025a6e Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Tue, 13 Jun 2006 21:07:46 +0000
Subject: [PATCH] Add RESTOREFILE to shorewall.conf

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4086 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall-lite/changelog.txt    |  4 ++++
 Shorewall-lite/releasenotes.txt | 35 ++++++++++++---------------------
 Shorewall-lite/shorewall.conf   | 18 +++++++++++++++++
 3 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/Shorewall-lite/changelog.txt b/Shorewall-lite/changelog.txt
index dbf793bdd..0241da709 100644
--- a/Shorewall-lite/changelog.txt
+++ b/Shorewall-lite/changelog.txt
@@ -1,3 +1,7 @@
+Changes in 3.2.0 RC 4
+
+1)  Add RESTOREFILE to shorewall.conf
+
 Changes in 3.2.0 RC 3
 
 1)  Fix configpath.
diff --git a/Shorewall-lite/releasenotes.txt b/Shorewall-lite/releasenotes.txt
index a777af686..ac6769011 100644
--- a/Shorewall-lite/releasenotes.txt
+++ b/Shorewall-lite/releasenotes.txt
@@ -1,28 +1,12 @@
-Shorewall Lite 3.2.0 RC 3
+Shorewall Lite 3.2.0 RC 4
 
-Problems Corrected in 3.2.0 RC 2
+Problems Corrected in 3.2.0 RC 4
 
-1)  The /usr/share/shorewall-lite/configpath file has been corrected to
-    correctly refer to /usr/share/shorewall-lite/.
+1)  RESTOREFILE has been added to shorewall.conf.
 
-2)  The /etc/shorewall-lite/Makefile has been corrected to refer to the
-    proper directories.
+Other changes in 3.2.0 RC 4
 
-3)  The /usr/share/shorewall-lite/shorecap program has been corrected
-    to refer to the proper directories and to correct a typo that
-    prevented the program for detecting any capabilities.
-
-4)  The default value of SUBSYSLOCK in shorewall.conf has been changed.
-
-Other changes in 3.2.0 RC 3
-
-1)  The controversial symbolic link /sbin/shorewall has been
-    eliminated. The Shorewall Lite control program is now
-    /sbin/shorewall-lite. Those users who only run Shorewall Lite and
-    who prefer the name /sbin/shorewall may create a symbolic link as
-    follows:
-
-	ln -sf shorewall-lite /sbin/shorewall
+None.
 
 New Features:
 
@@ -37,7 +21,14 @@ reference, we call this system the 'administrative system'.
 
 b) On each system where you wish to run a Shorewall-generated firewall,
 you install Shorewall Lite. For ease of reference, we will call these
-systems the 'firewall systems'.
+systems the 'firewall systems'.1)  The controversial symbolic link /sbin/shorewall has been
+    eliminated. The Shorewall Lite control program is now
+    /sbin/shorewall-lite. Those users who only run Shorewall Lite and
+    who prefer the name /sbin/shorewall may create a symbolic link as
+    follows:
+
+	ln -sf shorewall-lite /sbin/shorewall
+
 
 c) On the administrative system you create a separete 'configuration
 directory' for each firewall system. You copy the contents of
diff --git a/Shorewall-lite/shorewall.conf b/Shorewall-lite/shorewall.conf
index 46d1b975a..f7ca5eff8 100644
--- a/Shorewall-lite/shorewall.conf
+++ b/Shorewall-lite/shorewall.conf
@@ -145,4 +145,22 @@ SHOREWALL_SHELL=/bin/sh
 
 SUBSYSLOCK=/var/lock/subsys/shorewall-lite
 
+# RESTORE SCRIPT
+#
+# This option determines the script to be run in the following cases:
+#
+#       shorewall-lite -f start
+#       shorewall-lite restore
+#       shorewall-lite save
+#       shorewall-lite forget
+#       Failure of shorewall start or shorewall restart
+#
+# The value of the option must be the name of an executable file in the
+# directory /var/lib/shorewall. If this option is not set or if it is
+# set to the empty value (RESTOREFILE="") then RESTOREFILE=restore is
+# assumed.
+#
+
+RESTOREFILE=restore
+
 #LAST LINE -- DO NOT REMOVE