holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Another tweak to SHOREWALL_DIR handling

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5084 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-12-10 16:06:11 +00:00
parent 54fe8291b6
commit fd6ce5263a
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Shorewall/lib.base
View File

@ -832,6 +832,10 @@ ensure_config_path() {
[ -f $F ] || { echo " ERROR: $F does not exist"; exit 2; }
. $F
fi
if [ -n "$SHOREWALL_DIR" ]; then
[ "${CONFIG_PATH%%:*}" = "$SHOREWALL_DIR" ] || CONFIG_PATH=$SHOREWALL_DIR:$CONFIG_PATH
fi
}
#

9
Shorewall/lib.config
View File

@ -1846,17 +1846,14 @@ do_initialize() {
;;
esac
[ -n "$SHOREWALL_DIR" ] && SHOREWALL_DIR=$(resolve_file $SHOREWALL_DIR)
ensure_config_path
VERSION_FILE=$SHAREDIR/version
[ -f $VERSION_FILE ] && VERSION=$(cat $VERSION_FILE)
if [ -n "$SHOREWALL_DIR" ]; then
SHOREWALL_DIR=$(resolve_file $SHOREWALL_DIR)
CONFIG_PATH=$SHOREWALL_DIR:$CONFIG_PATH
fi
run_user_exit params
config=$(find_file shorewall.conf)
@ -1885,8 +1882,6 @@ do_initialize() {
[ -n "${MODULE_SUFFIX:=o gz ko o.gz ko.gz}" ]
[ -n "$SHOREWALL_DIR" ] && CONFIG_PATH=$SHOREWALL_DIR:$CONFIG_PATH
if [ -z "$EXPORT" -a "$(whoami)" = root ]; then
load_kernel_modules