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

Many changes involved in getting a relocated installations to work

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep
2012-04-01 10:47:24 -07:00
parent e48e13012c
commit bb6e17fd3e
25 changed files with 80 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Shorewall/lib.cli-std
View File

@@ -31,9 +31,12 @@
#
get_config() {
local prog
local confdir
ensure_config_path
if [ "$1" = Yes ]; then
params=$(find_file params)
@@ -46,7 +49,10 @@ get_config() {
if [ -f $config ]; then
if [ -r $config ]; then
confdir=${CONFDIR}
CONFDIR=${g_confdir}
. $config
CONFDIR=${confdir}
else
echo "Cannot read $config! (Hint: Are you root?)" >&2
exit 1
@@ -395,7 +401,7 @@ compiler() {
[ "$1" = nolock ] && shift;
shift
options="--verbose=$VERBOSITY --family=$g_family --config_path=$CONFIG_PATH"
options="--verbose=$VERBOSITY --family=$g_family --config_path=$CONFIG_PATH --shorewallrc=${g_sharedir}/shorewall/shorewallrc"
[ -n "$STARTUP_LOG" ] && options="$options --log=$STARTUP_LOG"
[ -n "$LOG_VERBOSITY" ] && options="$options --log_verbosity=$LOG_VERBOSITY";
[ -n "$g_export" ] && options="$options --export"