extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-11-26 09:33:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix Debian init script to use the value of OPTIONS from the defaults file.

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@8478 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
el_cubano 2008-04-26 04:28:55 +00:00
parent 6c35bd9cc4
commit 0ee498f4f1
5 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall-common/changelog.txt
View File

@ -36,6 +36,8 @@ Changes in 4.1.7
14) Fix IPSEC host entry with DYNAMIC_ZONES=Yes 14) Fix IPSEC host entry with DYNAMIC_ZONES=Yes
15) Use the OPTIONS variable from /etc/default/shorewall[-lite] on Debian.
Changes in 4.1.6 Changes in 4.1.6
1) Deprecate IMPLICIT_CONTINUE=Yes 1) Deprecate IMPLICIT_CONTINUE=Yes

3
Shorewall-common/init.debian.sh
View File

@ -59,6 +59,7 @@ not_configured () {
if [ -f "/etc/default/shorewall" ] if [ -f "/etc/default/shorewall" ]
then then
. /etc/default/shorewall . /etc/default/shorewall
$SRWL_OPTS+="$OPTIONS"
if [ "$startup" != "1" ] if [ "$startup" != "1" ]
then then
not_configured not_configured
@ -67,7 +68,7 @@ else
not_configured not_configured
fi fi
# wait an unconfigured interface # wait for an unconfigured interface
wait_for_pppd () { wait_for_pppd () {
if [ "$wait_interface" != "" ] if [ "$wait_interface" != "" ]
then then

5
Shorewall-common/releasenotes.txt
View File

@ -80,6 +80,11 @@ Problems Corrected in Shorewall 4.1.8
1) Changes to your configuration made by NULL_ROUTE_RFC1918=Yes are 1) Changes to your configuration made by NULL_ROUTE_RFC1918=Yes are
now reversed during 'shorewall stop' and 'shoreawll restart'. now reversed during 'shorewall stop' and 'shoreawll restart'.
2) The init script on Debian now reads and utilizes the value of the
OPTIONS variable from /etc/default/shorewall[-lite]. Previously,
the value of that variable was not passed to the shorewall[-lite]
command.
Other Changes in Shoreall 4.1.8. Other Changes in Shoreall 4.1.8.
1) When using Shorewall-perl, the CEIL and RATE columns must now 1) When using Shorewall-perl, the CEIL and RATE columns must now

8
Shorewall-lite/default.debian
View File

@ -12,13 +12,13 @@ startup=0
# wait_interface="ppp0" # wait_interface="ppp0"
# or # or
# wait_interface="ppp0 ppp1" # wait_interface="ppp0 ppp1"
# or, if you have defined in /etc/shorewall/params
# wait_interface=
# #
# Startup options -- if you specify '-f' then Shorewall will use the last saved # Startup options
# configuration if any; this is much faster than parsing the
# configuration files.
# #
OPTIONS="-f" OPTIONS=""
# EOF # EOF

1
Shorewall-lite/init.debian.sh
View File

@ -66,6 +66,7 @@ fi
if [ -f "/etc/default/shorewall-lite" ] if [ -f "/etc/default/shorewall-lite" ]
then then
. /etc/default/shorewall-lite . /etc/default/shorewall-lite
$SRWL_OPTS+="$OPTIONS"
if [ "$startup" != "1" ] if [ "$startup" != "1" ]
then then
not_configured not_configured