Fix documentation and 'try' command

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6385 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-05-17 14:42:25 +00:00
parent afd462c6b2
commit 2181d84dde
4 changed files with 22 additions and 6 deletions

View File

@ -210,7 +210,11 @@ Migration Considerations:
'' , #Log tag
'add';
f) The 'refresh' command is now synonymous with 'restart'.
f) The 'refresh' command is now works like 'restart' with the
following exceptions:
- The refresh command is rejected if Shorewall is not running.
- A directory name may not be specified in the refresh command.
g) Some run-time scripts will need to be changed to write their
iptables commands to file descriptor 3 in iptables-restore

View File

@ -405,7 +405,7 @@ start_command() {
0)
;;
1)
[ -n "$SHOREWALL_DIR" -o -n "$FAST" ] && usage 2
[ -n "$SHOREWALL_DIR" ] && usage 2
if [ ! -d $1 ]; then
if [ -e $1 ]; then
@ -983,6 +983,12 @@ try_command() {
2)
handle_directory $1
timeout=$2
case $timeout in
*[!0-9]*)
echo " ERROR: Invalid timeout ($timeout)" >&2;
exit 1
;;
esac
;;
*)
usage 1

View File

@ -1319,7 +1319,11 @@ gateway:~ #</programlisting>
specified, the saved configuration specified by the RESTOREFILE
option in <ulink
url="Documentation.htm#Conf">/etc/shorewall/shorewall.conf</ulink>
will be restored if that saved configuration exists</para>
will be restored if that saved configuration exists. When <emphasis
role="bold">-f</emphasis> is given, a
<replaceable>&lt;configuration-directory&gt;</replaceable> may not
be specified. The <emphasis role="bold">-f</emphasis> option is not
available with shorewall-lite.</para>
</listitem>
</varlistentry>

View File

@ -1117,13 +1117,15 @@
<para>Start shorewall. Existing connections through shorewall
managed interfaces are untouched. New connections will be allowed
only if they are allowed by the firewall rules or policies. If a
<emphasis>directory</emphasis> is included in the command, Shorewall
will look in that <emphasis>directory</emphasis> first for
<replaceable>directory</replaceable> is included in the command,
Shorewall will look in that <emphasis>directory</emphasis> first for
configuration files.If <emphasis role="bold">-f</emphasis> is
specified, the saved configuration specified by the RESTOREFILE
option in <ulink url="shorewall.conf.html">shorewall.conf</ulink>(5)
will be restored if that saved configuration exists and has been
modified more recently than the files in /etc/shorewall.</para>
modified more recently than the files in /etc/shorewall. When
<emphasis role="bold">-f</emphasis> is given, a
<replaceable>directory</replaceable> may not be specified.</para>
<para>The <option>-C</option> option determines the compiler to use
(Shorewall-shell or Shorewall-perl). If not specified, the