shorewall6/Makefile: fix to use reload instead of restart

Signed-off-by: Tuomo Soini <tis@foobar.fi>
shorewall6.conf: remove #LAST LINE - DO NOT REMOVE - shorewall.conf doesn't have this
2015-10-11 11:08:32 +03:00 · 2015-10-11 11:01:45 +03:00 · 2015-10-11 10:52:52 +03:00
8 changed files with 6 additions and 16 deletions
--- a/Shorewall/manpages/shorewall.conf.xml
+++ b/Shorewall/manpages/shorewall.conf.xml
@@ -1157,10 +1157,10 @@ net     all  DROP   info</programlisting>then the chain name is 'net-all'
          releases and <emphasis role="bold">restart</emphasis> became a true
          restart (equivalent to <emphasis role="bold">stop</emphasis>
          followed by <emphasis role="bold">start</emphasis>). When
-          LEGACY_FASTSTART=Yes, the <emphasis role="bold">restart</emphasis>
+          LEGACY_RESTART=Yes, the <emphasis role="bold">restart</emphasis>
          command performs the same operation as the <emphasis
          role="bold">reload</emphasis> command making it compatible with
-          earlier releases. If not specified, LAGACY_RESTART=No is
+          earlier releases. If not specified, LEGACY_RESTART=No is
          assumed.</para>
        </listitem>
      </varlistentry>
--- a/Shorewall6/Makefile
+++ b/Shorewall6/Makefile
@@ -8,11 +8,11 @@ all: $(VARDIR)/$(RESTOREFILE)
 $(VARDIR)/$(RESTOREFILE): $(CONFDIR)/*
 	@/sbin/shorewall6 -q save >/dev/null; \
 	if \
-	    /sbin/shorewall6 -q restart >/dev/null 2>&1; \
+	    /sbin/shorewall6 -q reload >/dev/null 2>&1; \
 	then \
 	    /sbin/shorewall6 -q save >/dev/null; \
 	else \
-	    /sbin/shorewall6 -q restart 2>&1 | tail >&2; exit 1; \
+	    /sbin/shorewall6 -q reload 2>&1 | tail >&2; exit 1; \
 	fi
 clean:
--- a/Shorewall6/Samples6/Universal/shorewall6.conf
+++ b/Shorewall6/Samples6/Universal/shorewall6.conf
@@ -248,5 +248,3 @@ PROVIDER_OFFSET=
 MASK_BITS=
 ZONE_BITS=0
 #LAST LINE -- DO NOT REMOVE
--- a/Shorewall6/Samples6/one-interface/shorewall6.conf
+++ b/Shorewall6/Samples6/one-interface/shorewall6.conf
@@ -249,5 +249,3 @@ PROVIDER_OFFSET=
 MASK_BITS=
 ZONE_BITS=0
 #LAST LINE -- DO NOT REMOVE
--- a/Shorewall6/Samples6/three-interfaces/shorewall6.conf
+++ b/Shorewall6/Samples6/three-interfaces/shorewall6.conf
@@ -248,5 +248,3 @@ PROVIDER_OFFSET=
 MASK_BITS=
 ZONE_BITS=0
 #LAST LINE -- DO NOT REMOVE
--- a/Shorewall6/Samples6/two-interfaces/shorewall6.conf
+++ b/Shorewall6/Samples6/two-interfaces/shorewall6.conf
@@ -248,5 +248,3 @@ PROVIDER_OFFSET=
 MASK_BITS=
 ZONE_BITS=0
 #LAST LINE -- DO NOT REMOVE
--- a/Shorewall6/configfiles/shorewall6.conf
+++ b/Shorewall6/configfiles/shorewall6.conf
@@ -248,5 +248,3 @@ PROVIDER_OFFSET=
 MASK_BITS=
 ZONE_BITS=0
 #LAST LINE -- DO NOT REMOVE
--- a/Shorewall6/manpages/shorewall6.conf.xml
+++ b/Shorewall6/manpages/shorewall6.conf.xml
@@ -1021,10 +1021,10 @@ net     all  DROP   info</programlisting>then the chain name is 'net-all'
          releases and <emphasis role="bold">restart</emphasis> became a true
          restart (equivalent to <emphasis role="bold">stop</emphasis>
          followed by <emphasis role="bold">start</emphasis>). When
-          LEGACY_FASTSTART=Yes, the <emphasis role="bold">restart</emphasis>
+          LEGACY_RESTART=Yes, the <emphasis role="bold">restart</emphasis>
          command performs the same operation as the reload command making it
          compatible with earlier releases. If not specified,
-          LAGACY_RESTART=No is assumed.</para>
+          LEGACY_RESTART=No is assumed.</para>
        </listitem>
      </varlistentry>
Author	SHA1	Message	Date
Tuomo Soini	48c654fbed	shorewall6/Makefile: fix to use reload instead of restart Signed-off-by: Tuomo Soini <tis@foobar.fi>	2015-10-11 11:08:32 +03:00
Tuomo Soini	a97b0194c1	shorewall6.conf: remove #LAST LINE - DO NOT REMOVE - shorewall.conf doesn't have this Signed-off-by: Tuomo Soini <tis@foobar.fi>	2015-10-11 11:01:45 +03:00
Tuomo Soini	f84214c8da	shorewall[6].conf.xml: fix LEGACY_RESTART entry Signed-off-by: Tuomo Soini <tis@foobar.fi>	2015-10-11 10:52:52 +03:00