Bring forward progress message fix

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4874 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-11-14 18:24:09 +00:00
parent 09d44df548
commit 1447b53d84
2 changed files with 8 additions and 4 deletions

View File

@ -492,16 +492,16 @@ setup_ipsec() {
case $IPSECFILE in case $IPSECFILE in
zones) zones)
f=zones f=zones
progress_message2 "$DOING IPSEC..." progress_message "$DOING IPSEC..."
[ -n "$IPSEC_ZONES" ] && save_progress_message "Setting up IPSEC management..." [ $PROGRAM = compiler && -n "$IPSEC_ZONES" ] && save_progress_message "Setting up IPSEC management..."
;; ;;
*) *)
f=$IPSECFILE f=$IPSECFILE
strip_file $f strip_file $f
using_ipsec=Yes using_ipsec=Yes
if [ -s ${TMP_DIR}/$f ]; then if [ -s ${TMP_DIR}/$f ]; then
progress_message2 "$DOING $f..." progress_message "$DOING $f..."
save_progress_message "Setting up IPSEC management..." [ $PROGRAM = compiler ] && save_progress_message "Setting up IPSEC management..."
fi fi
;; ;;
esac esac

View File

@ -50,6 +50,8 @@ add_to_zone() # $1...${n-1} = <interface>[:<hosts>] $n = zone
fi fi
} }
DOING=Processing
DONE=Processed
# #
# Load $zones # Load $zones
# #
@ -229,6 +231,8 @@ delete_from_zone() # $1 = <interface>[:<hosts>] $2 = zone
local dhcp_interfaces blacklist_interfaces maclist_interfaces tcpflags_interfaces local dhcp_interfaces blacklist_interfaces maclist_interfaces tcpflags_interfaces
local rulenum source_chain dest_hosts iface hosts hostlist= local rulenum source_chain dest_hosts iface hosts hostlist=
DOING=Processing
DONE=Processed
# #
# Load $zones # Load $zones
# #