Fix init.debian.sh

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1278 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2004-04-21 20:12:23 +00:00
parent f683f9a7fc
commit feb2b993ee
3 changed files with 15 additions and 3 deletions

View File

@ -24,3 +24,5 @@ Changes since 2.0.1
11) Update the bogons file 11) Update the bogons file
12) Added example for log rate limiting knobs in shorewall.conf. 12) Added example for log rate limiting knobs in shorewall.conf.
13) Fix init.debian.sh.

View File

@ -7,7 +7,6 @@ WAIT_FOR_IFUP=/usr/share/shorewall/wait4ifup
INITLOG=/var/log/shorewall-init.log INITLOG=/var/log/shorewall-init.log
test -x $SRWL || exit 0 test -x $SRWL || exit 0
test -x $WAIT_FOR_IFUP || exit 0
test -n $INITLOG || { test -n $INITLOG || {
echo "INITLOG cannot be empty, please configure $0" ; echo "INITLOG cannot be empty, please configure $0" ;
exit 1; exit 1;
@ -65,11 +64,18 @@ fi
# wait an unconfigured interface # wait an unconfigured interface
wait_for_pppd () { wait_for_pppd () {
if [ "$wait_interface" != "" ] if [ "$wait_interface" != "" ]
then
if [ -f $WAIT_FOR_IFUP ]
then then
for i in $wait_interface for i in $wait_interface
do do
$WAIT_FOR_IFUP $i 90 $WAIT_FOR_IFUP $i 90
done done
else
echo "$WAIT_FOR_IFUP: File not found" >> $INITLOG
echo_notdone
exit 2
fi
fi fi
} }

View File

@ -3,7 +3,11 @@ Shorewall 2.0.2-Beta 1
---------------------------------------------------------------------- ----------------------------------------------------------------------
Problems Corrected since 2.0.1 Problems Corrected since 2.0.1
None. 1) The /etc/init.d/shorewall script installed on Debian by install.sh
failed silently due to a missing file
(/usr/share/shorewall/wait4ifup). That file is not part of the
normal Shorewall distribution and is provided by the Debian
maintainer.
----------------------------------------------------------------------- -----------------------------------------------------------------------
Issues when migrating from Shorewall 2.0.0 to Shorewall 2.0.1: Issues when migrating from Shorewall 2.0.0 to Shorewall 2.0.1: