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

Merge branch '4.5.4'

Browse Source
This commit is contained in:
Tom Eastep 2012-06-02 08:20:40 -07:00
commit 01eb1a580b
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Shorewall-init/ifupdown.sh
View File

@ -180,9 +180,11 @@ else
esac esac
fi fi
[ -n "$LOGFILE" ] || LOGFILE=/dev/null
for PRODUCT in $PRODUCTS; do for PRODUCT in $PRODUCTS; do
if [ -x $VARDIR/$PRODUCT/firewall ]; then if [ -x $VARDIR/$PRODUCT/firewall ]; then
( ${VARDIR}/$PRODUCT/firewall -V0 $COMMAND $INTERFACE ) || true ( ${VARDIR}/$PRODUCT/firewall -V0 $COMMAND $INTERFACE >> $LOGFILE 2>&1 ) || true
fi fi
done done

5
Shorewall-init/sysconfig
View File

@ -16,3 +16,8 @@ IFUPDOWN=0
# during 'start' and will save them there during 'stop'. # during 'start' and will save them there during 'stop'.
# #
SAVE_IPSETS="" SAVE_IPSETS=""
#
# Where Up/Down events get logged
#
LOGFILE=/var/log/shorewall-updown.log

4
Shorewall/Perl/Shorewall/Providers.pm
View File

@ -1445,13 +1445,13 @@ sub compile_updown() {
q( disable_provider $1) , q( disable_provider $1) ,
q( fi) , q( fi) ,
q(elif [ "$COMMAND" = up ]; then) , q(elif [ "$COMMAND" = up ]; then) ,
q( echo 0 > \${VARDIR}/${1}.state) , q( echo 0 > ${VARDIR}/${1}.status) ,
q( COMMAND=start), q( COMMAND=start),
q( progress_message3 "$g_product attempting start") , q( progress_message3 "$g_product attempting start") ,
q( detect_configuration), q( detect_configuration),
q( define_firewall), q( define_firewall),
q(else), q(else),
q( progress_message3 "\$COMMAND on interface $1 ignored") , q( progress_message3 "$COMMAND on interface $1 ignored") ,
q(fi) , q(fi) ,
q(;;) ); q(;;) );