extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-01-20 20:48:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make AUTOMAKE apply to 'restart'

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9769 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2009-03-31 18:54:53 +00:00
parent 238ff4550f
commit 48155417b1
2 changed files with 45 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Shorewall6/shorewall6
View File

@ -390,6 +390,7 @@ compiler() {
start_command() { start_command() {
local finished local finished
finished=0 finished=0
local restorefile
do_it() { do_it() {
local rc local rc
@ -489,6 +490,7 @@ start_command() {
if [ -n "${FAST}${AUTOMAKE}" ]; then if [ -n "${FAST}${AUTOMAKE}" ]; then
if qt mywhich make; then if qt mywhich make; then
restorefile=$RESTOREFILE
# #
# RESTOREFILE is exported by get_config() # RESTOREFILE is exported by get_config()
# #
@ -503,6 +505,8 @@ start_command() {
FAST= FAST=
AUTOMAKE= AUTOMAKE=
fi fi
RESTOREFILE=$restorefile
else else
FAST= FAST=
AUTOMAKE= AUTOMAKE=
@ -693,6 +697,7 @@ restart_command() {
finished=0 finished=0
local rc local rc
rc=0 rc=0
local restorefile
while [ $finished -eq 0 -a $# -gt 0 ]; do while [ $finished -eq 0 -a $# -gt 0 ]; do
option=$1 option=$1
@ -764,6 +769,18 @@ restart_command() {
export NOROUTES export NOROUTES
export PURGE export PURGE
if [ -z "$FAST" -a -n "$AUTOMAKE" ]; then
if qt mywhich make; then
#
# RESTOREFILE is exported by get_config()
#
restorefile=$RESTOREFILE
RESTOREFILE=firewall
make -qf ${CONFDIR}/Makefile && FAST=Yes
RESTOREFILE=$restorefile
fi
fi
if [ -z "$FAST" ]; then if [ -z "$FAST" ]; then
progress_message3 "Compiling..." progress_message3 "Compiling..."

16
manpages6/shorewall6.conf.xml
View File

@ -208,13 +208,15 @@
role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>]</term> role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>]</term>
<listitem> <listitem>
<para>If set, the behavior of the 'start' command is change; if no <para>If set, the behavior of the <command>start</command> and
files in /etc/shorewall have been changed since the last successful <command>restart</command> commands is change; if no files in
<command>start</command> or <command>restart</command> command, then <filename><filename
the compilation step is skipped and the compiled script that class="directory">/etc/shorewall</filename></filename> have been
executed the last <command>start</command> or changed since the last successful <command>start</command> or
<command>restart</command> command is used. The default is <command>restart</command> command, then the compilation step is
AUTOMAKE=No.</para> skipped and the compiled script that executed the last
<command>start</command> or <command>restart</command> command is
used. The default is AUTOMAKE=No.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>