Merge branch '4.4.26'

This commit is contained in:
Tom Eastep 2011-12-03 06:01:03 -08:00
commit dbf75af411
2 changed files with 8 additions and 0 deletions

View File

@ -366,6 +366,10 @@ compiler() {
# We've now set SHOREWALL_DIR so recalculate CONFIG_PATH
#
ensure_config_path
#
# Get the config from $SHOREWALL_DIR
#
[ -n "$SHOREWALL_DIR" -a "$SHOREWALL_DIR" != /etc/shorewall ] && get_config
case $COMMAND in
*start|try|refresh)

View File

@ -366,6 +366,10 @@ compiler() {
# We've now set SHOREWALL_DIR so recalculate CONFIG_PATH
#
ensure_config_path
#
# Get the config from $SHOREWALL_DIR
#
[ -n "$SHOREWALL_DIR" -a "$SHOREWALL_DIR" != /etc/shorewall6 ] && get_config
case $COMMAND in
*start|try|refresh)