Eliminate STOPPING variable

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2010-03-02 07:37:30 -08:00
parent d4936f4bad
commit 5fc6d58e19
5 changed files with 13 additions and 4 deletions

View File

@ -233,7 +233,7 @@ sub generate_script_2() {
append_file 'params' if $config{EXPORTPARAMS}; append_file 'params' if $config{EXPORTPARAMS};
emit ( '', emit ( '',
"STOPPING=", "g_stopping=",
'', '',
'#', '#',
'# The library requires that ${VARDIR} exist', '# The library requires that ${VARDIR} exist',

View File

@ -2282,11 +2282,14 @@ EOF
;; ;;
esac esac
if [ -n "$g_stopping" ]; then
kill $$
exit 1
fi
set_state "Stopping" set_state "Stopping"
STOPPING="Yes" g_stopping="Yes"
TERMINATOR=
deletechain shorewall deletechain shorewall

View File

@ -658,6 +658,8 @@ SHELL cat /etc/shorewall/rules.d/*.rules</programlisting></para>
<member><emphasis role="bold">Any name beginning with SHOREWALL_ or <member><emphasis role="bold">Any name beginning with SHOREWALL_ or
SW_</emphasis></member> SW_</emphasis></member>
<member>STOPPING</member>
<member>TEST</member> <member>TEST</member>
<member><emphasis role="bold">TIMESTAMP</emphasis></member> <member><emphasis role="bold">TIMESTAMP</emphasis></member>

View File

@ -75,6 +75,8 @@
<member><emphasis role="bold">Any name beginning with SHOREWALL_ or <member><emphasis role="bold">Any name beginning with SHOREWALL_ or
SW_</emphasis></member> SW_</emphasis></member>
<member>STOPPING</member>
<member>TEST</member> <member>TEST</member>
<member><emphasis role="bold">TIMESTAMP</emphasis></member> <member><emphasis role="bold">TIMESTAMP</emphasis></member>

View File

@ -76,6 +76,8 @@
<member><emphasis role="bold">Any name beginning with SHOREWALL_ or <member><emphasis role="bold">Any name beginning with SHOREWALL_ or
SW_</emphasis></member> SW_</emphasis></member>
<member>STOPPING</member>
<member>TEST</member> <member>TEST</member>
<member><emphasis role="bold">TIMESTAMP</emphasis></member> <member><emphasis role="bold">TIMESTAMP</emphasis></member>