From d7116bf2dffcfd27492b8eeeabbcdc0b8874f804 Mon Sep 17 00:00:00 2001 From: teastep Date: Fri, 27 Aug 2004 01:36:07 +0000 Subject: [PATCH] Include params file on restore git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1582 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall2/changelog.txt | 2 ++ Shorewall2/firewall | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/Shorewall2/changelog.txt b/Shorewall2/changelog.txt index 4c394f3a1..032817cd3 100644 --- a/Shorewall2/changelog.txt +++ b/Shorewall2/changelog.txt @@ -54,3 +54,5 @@ Changes since 2.0.3 25) Allow distinct input and output IPSEC parameters. 26) Allow source port remapping in /etc/shorewall/masq. + +27) Include params file on 'restore' diff --git a/Shorewall2/firewall b/Shorewall2/firewall index 30b5ef58d..157a4e6d7 100755 --- a/Shorewall2/firewall +++ b/Shorewall2/firewall @@ -6098,6 +6098,12 @@ define_firewall() # $1 = Command (Start or Restart) save_command "#" save_command ". /usr/share/shorewall/functions" + f=$(find_file params) + + [ -f $f ] && \ + save_command ". $f" + + save_command "#" save_command "MODULESDIR=\"$MODULESDIR\"" save_command "MODULE_SUFFIX=\"$MODULE_SUFFIX\""