mirror of
https://gitlab.com/shorewall/code.git
synced 2025-05-02 07:04:31 +02:00
More verbosity control
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3359 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
cf8344b26d
commit
52f7028aa5
@ -64,7 +64,8 @@ startup_error() # $* = Error Message
|
|||||||
}
|
}
|
||||||
|
|
||||||
#
|
#
|
||||||
# Write the passed args to $RESTOREBASE
|
# Write the passed args to $RESTOREBASE -- We need all of these varieties to support
|
||||||
|
# extension scripts.
|
||||||
#
|
#
|
||||||
save_command()
|
save_command()
|
||||||
{
|
{
|
||||||
@ -8579,7 +8580,7 @@ __EOF__
|
|||||||
else
|
else
|
||||||
chmod 700 $outfile
|
chmod 700 $outfile
|
||||||
|
|
||||||
echo "Shorewall configuration compiled to $outfile"
|
progress_message2 "Shorewall configuration compiled to $outfile"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
rm -rf $TMP_DIR
|
rm -rf $TMP_DIR
|
||||||
|
@ -75,6 +75,11 @@ progress_message2() # $* = Message
|
|||||||
[ $VERBOSE -gt 0 ] && echo "$@"
|
[ $VERBOSE -gt 0 ] && echo "$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
progress_message3() # $* = Message
|
||||||
|
{
|
||||||
|
[ $VERBOSE -ge 0 ] && echo "$@"
|
||||||
|
}
|
||||||
|
|
||||||
#
|
#
|
||||||
# Suppress all output for a command
|
# Suppress all output for a command
|
||||||
#
|
#
|
||||||
|
@ -877,8 +877,11 @@ reload_command() {
|
|||||||
|
|
||||||
[ -n "$nolock" ] || mutex_on
|
[ -n "$nolock" ] || mutex_on
|
||||||
|
|
||||||
|
progress_message3 "Compiling..."
|
||||||
|
|
||||||
if $SHOREWALL_SHELL /usr/share/shorewall/compiler $debugging $nolock compile /var/lib/shorewall/.reload; then
|
if $SHOREWALL_SHELL /usr/share/shorewall/compiler $debugging $nolock compile /var/lib/shorewall/.reload; then
|
||||||
$0 nolock $(make_verbose) restore .reload
|
progress_message3 "Installing..."
|
||||||
|
/var/lib/shorewall/.reload $(make_verbose) reload
|
||||||
fi
|
fi
|
||||||
|
|
||||||
[ -n "$nolock" ] || mutex_off
|
[ -n "$nolock" ] || mutex_off
|
||||||
|
Loading…
Reference in New Issue
Block a user