Merge branch '4.5.21'

This commit is contained in:
Tom Eastep 2013-12-08 14:12:29 -08:00
commit b1241cf695

View File

@ -220,6 +220,13 @@ esac</programlisting><caution>
<programlisting>#! /bin/sh <programlisting>#! /bin/sh
cat -</programlisting> cat -</programlisting>
</listitem> </listitem>
<listitem>
<para><filename>postcompile</filename> -- Added in Shorewall 4.5.8.
This shell script is invoked by<emphasis role="bold">
/sbin/shorewall</emphasis> after a script has been compiled. $1 is the
path name of the compiled script.</para>
</listitem>
</itemizedlist> </itemizedlist>
<para><emphasis role="bold">If your version of Shorewall doesn't have the <para><emphasis role="bold">If your version of Shorewall doesn't have the
@ -284,6 +291,13 @@ cat -</programlisting>
<entry>check, compile, export, refresh, restart, start</entry> <entry>check, compile, export, refresh, restart, start</entry>
</row> </row>
<row>
<entry>postcompile</entry>
<entry>compile, export, load, refresh, reload, restart, restore,
start</entry>
</row>
<row> <row>
<entry>refresh</entry> <entry>refresh</entry>
@ -498,7 +512,7 @@ cat -</programlisting>
</row> </row>
<row> <row>
<entry></entry> <entry>postcompile</entry>
<entry>started</entry> <entry>started</entry>
</row> </row>
@ -548,10 +562,11 @@ cat -</programlisting>
</tgroup> </tgroup>
</informaltable></para> </informaltable></para>
<para>Compile-time extension scripts are executed using the Perl 'eval <para>With the exception of postcompile, compile-time extension scripts
`cat &lt;<emphasis>file</emphasis>&gt;`' mechanism. Be sure that each are executed using the Perl 'eval `cat
script returns a 'true' value; otherwise, the compiler will assume that &lt;<emphasis>file</emphasis>&gt;`' mechanism. Be sure that each script
the script failed and will abort the compilation.</para> returns a 'true' value; otherwise, the compiler will assume that the
script failed and will abort the compilation.</para>
<para>Each compile-time script is implicitly prefaced with:</para> <para>Each compile-time script is implicitly prefaced with:</para>