From fb16fd6d6e21568833e8596747e61f9b59ef3109 Mon Sep 17 00:00:00 2001 From: teastep Date: Fri, 18 May 2007 21:34:51 +0000 Subject: [PATCH] Make '[re]load' observe the -C directive git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6403 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall-common/shorewall | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Shorewall-common/shorewall b/Shorewall-common/shorewall index 81b394c0d..8a7e1c521 100755 --- a/Shorewall-common/shorewall +++ b/Shorewall-common/shorewall @@ -1067,7 +1067,7 @@ rcp_command() { # reload_command() # $* = original arguments less the command. { - local verbose=$(make_verbose) file= capabilities= finished=0 saveit= result directory system getcaps= root=root + local verbose=$(make_verbose) file= capabilities= finished=0 saveit= result directory system getcaps= root=root compiler= [ -n "$LITEDIR" ] || fatal_error "ERROR: LITEDIR not defined in ${SHAREDIR}/configpath" @@ -1099,7 +1099,7 @@ reload_command() # $* = original arguments less the command. ;; C) [ $# -gt 1 ] || fatal_error "-C must be followed by a compiler name" - SHOREWALL_COMPILER=$2 + compiler="-C $2" option= shift ;; @@ -1155,7 +1155,7 @@ reload_command() # $* = original arguments less the command. file=$(resolve_file $directory/firewall) - if shorewall $debugging $verbose compile -e $directory $directory/firewall && \ + if shorewall $debugging $verbose compile -e $compiler $directory $directory/firewall && \ progress_message "Copying $file and ${file}.conf to ${system}:${LITEDIR}..." && \ rcp_command "$directory/firewall $directory/firewall.conf" ${LITEDIR} then