extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-05-31 15:05:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

No longer process the local shorewall.conf when compiling from a directory

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-09-01 08:21:45 -07:00
parent 4f2a4c0c6c
commit 092c2ef8f7
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall-core/lib.cli
View File

@ -3139,7 +3139,7 @@ shorewall_cli() {
g_shorewalldir= g_shorewalldir=
VERBOSE= VERBOSE=
VERBOSITY= VERBOSITY=1
[ -n "$g_lite" ] || . ${g_basedir}/lib.cli-std [ -n "$g_lite" ] || . ${g_basedir}/lib.cli-std

6
Shorewall/lib.cli-std
View File

@ -34,8 +34,6 @@ get_config() {
ensure_config_path ensure_config_path
if [ "$1" = Yes ]; then if [ "$1" = Yes ]; then
params=$(find_file params) params=$(find_file params)
@ -378,7 +376,7 @@ compiler() {
# #
# Get the config from $g_shorewalldir # Get the config from $g_shorewalldir
# #
[ -n "$g_shorewalldir" -a "$g_shorewalldir" != ${g_confdir} ] && get_config get_config Yes
case $COMMAND in case $COMMAND in
*start|try|refresh) *start|try|refresh)
@ -1648,7 +1646,6 @@ compiler_command() {
case $COMMAND in case $COMMAND in
compile) compile)
get_config Yes
shift shift
compile_command $@ compile_command $@
;; ;;
@ -1658,7 +1655,6 @@ compiler_command() {
refresh_command $@ refresh_command $@
;; ;;
check) check)
get_config Yes
shift shift
check_command $@ check_command $@
;; ;;