mirror of
https://gitlab.com/shorewall/code.git
synced 2025-06-20 01:37:59 +02:00
Suppress 'save' operations during refresh
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@2823 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
b403a8c200
commit
2b6d22c40d
@ -28,7 +28,7 @@
|
|||||||
# shown below. Simply run this script to revert to your prior version of
|
# shown below. Simply run this script to revert to your prior version of
|
||||||
# Shoreline Firewall.
|
# Shoreline Firewall.
|
||||||
|
|
||||||
VERSION=2.5.7
|
VERSION=2.5.8
|
||||||
|
|
||||||
usage() # $1 = exit status
|
usage() # $1 = exit status
|
||||||
{
|
{
|
||||||
|
@ -112,9 +112,11 @@ save_command()
|
|||||||
#
|
#
|
||||||
save_progress_message()
|
save_progress_message()
|
||||||
{
|
{
|
||||||
echo >> $RESTOREBASE
|
if [ $COMMAND != refresh ]; then
|
||||||
echo "progress_message \"$@\"" >> $RESTOREBASE
|
echo >> $RESTOREBASE
|
||||||
echo >> $RESTOREBASE
|
echo "progress_message \"$@\"" >> $RESTOREBASE
|
||||||
|
echo >> $RESTOREBASE
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -125,7 +127,7 @@ save_progress_message()
|
|||||||
#
|
#
|
||||||
run_and_save_command()
|
run_and_save_command()
|
||||||
{
|
{
|
||||||
echo "$@" >> $RESTOREBASE
|
[ $COMMAND = refresh ] || echo "$@" >> $RESTOREBASE
|
||||||
eval $*
|
eval $*
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -135,7 +137,7 @@ run_and_save_command()
|
|||||||
ensure_and_save_command()
|
ensure_and_save_command()
|
||||||
{
|
{
|
||||||
if eval $* ; then
|
if eval $* ; then
|
||||||
echo "$@" >> $RESTOREBASE
|
[ $COMMAND = refresh ] || echo "$@" >> $RESTOREBASE
|
||||||
else
|
else
|
||||||
[ -z "$STOPPING" ] && { stop_firewall; exit 2; }
|
[ -z "$STOPPING" ] && { stop_firewall; exit 2; }
|
||||||
fi
|
fi
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
|
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
|
||||||
#
|
#
|
||||||
|
|
||||||
VERSION=2.5.7
|
VERSION=2.5.8
|
||||||
|
|
||||||
usage() # $1 = exit status
|
usage() # $1 = exit status
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user