Little cleanup of release notes and /sbin/shorewall

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@2431 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2005-07-29 19:06:37 +00:00
parent 9feb547b6e
commit 86f20a374b
2 changed files with 21 additions and 4 deletions

View File

@ -149,13 +149,23 @@ Migration Considerations:
Shorewall (started or not-started). The previous status command has
been renamed "dump".
A new "state" command gives the Shorewall state relative to the
state diagram at
http://shorewall.net/starting_and_stopping_shorewall.htm. In
addition to the state, the time and date at which that state was
entered is shown.
Note that at least one "shorewall [re]start" must be issued after
upgrading to this release before "shorewall state" will show
anything but "Unknown" for the state.
New Features in Shorewall 2.5.0
1) Error and warning messages are made easier to spot by using
capitalization (e.g., ERROR: and WARNING:).
2) Beginning with this version, the POLICY column in
/etc/shorewall/policy to potentially contain two policies separated
/etc/shorewall/policy can potentially contain two policies separated
by ":". The first policy is the policy for new connections (the only
policy that you can currently configure). The second policy is for
ESTABLISHED packets (those that are part of an established

View File

@ -240,6 +240,13 @@ get_config() {
}
#
# Determine if Shorewall is "running"
#
shorewall_is_started() {
qt $IPTABLES -L shorewall -n
}
#
# Clear descriptor 1 if it is a terminal
#
@ -400,7 +407,7 @@ logwatch() # $1 = timeout -- if negative, prompt each time that
save_config() {
[ "$nolock" ] || mutex_on
if qt $IPTABLES -L shorewall -n; then
if shorewall_is_started ; then
[ -d /var/lib/shorewall ] || mkdir -p /var/lib/shorewall
if [ -f $RESTOREPATH -a ! -x $RESTOREPATH ]; then
@ -911,7 +918,7 @@ case "$1" in
;;
status)
[ $# -eq 1 ] || usage 1
if qt $IPTABLES -L shorewall -n -v; then
if shorewall_is_started ; then
echo "Shorewall is running"
exit 0
fi
@ -1273,7 +1280,7 @@ case "$1" in
mutex_on
if qt $IPTABLES -L shorewall -n
if shorewall_is_started
then
running=0
else