From c5b8f312dc7dd5ce27aba0f1169e62ca445fd117 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sat, 18 Nov 2006 23:48:56 +0000
Subject: [PATCH] Bring forward ipsets restoration fix

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4908 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall/compiler | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/Shorewall/compiler b/Shorewall/compiler
index ac3cb7fb6..da2fcbc68 100755
--- a/Shorewall/compiler
+++ b/Shorewall/compiler
@@ -5232,16 +5232,19 @@ __EOF__
 	setcontinue OUTPUT
     fi
 
-    f=$(find_file ipsets)
+    indent >&3 << __EOF__
 
-    if [ -f $f ]; then
-	progress_message2 "Processing $f ..."
-	save_progress_message "Restoring IPSETS..."
-	save_command "ipset -U :all: :all:"
-	save_command "ipset -F"
-	save_command "ipset -X"
-	save_command "ipset -R < $f"
-    fi
+f=\$(find_file ipsets)
+
+if [ -f \$f ]; then
+    progress_message2 "Restoring IPSETS..."
+    ipset -U :all: :all:
+    ipset -F
+    ipset -X
+    ipset -R < \$f
+fi
+
+__EOF__
 
     append_file continue