Include Shorewall status in the heading of the dump output

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-02-26 16:14:43 -08:00
parent 61bf2d5bfd
commit fc12125223

View File

@ -1112,7 +1112,7 @@ do_dump_command() {
echo " Shorewall $(cat /usr/share/shorewall/version)" echo " Shorewall $(cat /usr/share/shorewall/version)"
echo echo
fi fi
show_status
show_reset show_reset
host=$(echo $g_hostname | sed 's/\..*$//') host=$(echo $g_hostname | sed 's/\..*$//')
$g_tool -L $g_ipt_options $g_tool -L $g_ipt_options
@ -2369,9 +2369,7 @@ report_capabilities1() {
echo KERNELVERSION=$KERNELVERSION echo KERNELVERSION=$KERNELVERSION
} }
status_command() { show_status() {
echo "${g_product}-$SHOREWALL_VERSION Status at $g_hostname - $(date)"
echo
if product_is_started ; then if product_is_started ; then
echo "$g_product is running" echo "$g_product is running"
status=0 status=0
@ -2391,6 +2389,12 @@ status_command() {
state=Unknown state=Unknown
fi fi
echo "State:$state" echo "State:$state"
}
status_command() {
echo "${g_product}-$SHOREWALL_VERSION Status at $g_hostname - $(date)"
echo
show_status
echo echo
exit $status exit $status
} }