extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-05-31 06:55:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix Makefile and 'shorewall start f'

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3657 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-03-12 00:00:22 +00:00
parent 5e04e2185d
commit 04e112d306
4 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Shorewall/Makefile
View File

@ -1,9 +1,10 @@
# Shorewall Makefile to restart if config-files are newer than last restart # Shorewall Makefile to restart if config-files are newer than last restart
VARDIR=/var/lib/shorewall VARDIR=/var/lib/shorewall
CONFDIR=/etc/shorewall CONFDIR=/etc/shorewall
all: $(VARDIR)/.restore RESTOREFILE?=restore
all: $(VARDIR)/${RESTOREFILE}
$(VARDIR)/.restore: $(CONFDIR)/* $(VARDIR)/${RESTOREFILE}: $(CONFDIR)/*
@/sbin/shorewall -q save >/dev/null; \ @/sbin/shorewall -q save >/dev/null; \
if \ if \
/sbin/shorewall -q restart >/dev/null 2>&1; \ /sbin/shorewall -q restart >/dev/null 2>&1; \

6
Shorewall/changelog.txt
View File

@ -1,4 +1,8 @@
Changes in 3.1.x. Changes in 3.2.0 Beta 2
1) Make "shorewall start -f" work correctly.
Changes in 3.1.x. and 3.2.x
1) Removal of dynamic zones. 1) Removal of dynamic zones.

22
Shorewall/releasenotes.txt
View File

@ -1,4 +1,4 @@
Shorewall 3.2.0 Beta 1. Shorewall 3.2.0 Beta 2.
Note to users upgrading from Shorewall 2.x or 3.0 Note to users upgrading from Shorewall 2.x or 3.0
@ -27,22 +27,12 @@ Note to users upgrading from Shorewall 2.x or 3.0
Please see the "Migration Considerations" below for additional upgrade Please see the "Migration Considerations" below for additional upgrade
information. information.
Problems Corrected in 3.2.0 Beta 1 Problems Corrected in 3.2.0 Beta 2
1) The /etc/shorewall/params file is now copied into the compiled program 1) The Makefile is now sensitive to the RESTOREFILE variable if that
so that its contents are processed both at compile-time and at variable is defined at make time. The /sbin/shorewall script has been
run-time. The latter is required so that extension scripts will have updated to define RESTOREFILE when it invokes 'make' during processing
access to the variables that the file initializes. of the "shorewall start -f" command.
2) The iptable_mangle and iptable_nat modules were previously omitted from
/etc/shorewall/modules.
Other changes in 3.2.0 Beta 1
1) By default, the program generated by the "shorewall compile" command
cannot be installed into /etc/init.d/ unless the "-d <distro>" option
is given. This will make the default behavior distribution-neutral
which is what it should be.
Migration Considerations: Migration Considerations:

2
Shorewall/shorewall
View File

@ -583,7 +583,7 @@ start_command() {
if [ -n "$FAST" ]; then if [ -n "$FAST" ]; then
if qt mywhich make; then if qt mywhich make; then
make -qf /etc/shorewall/Makefile || FAST= RESTOREFILE=$RESTOREFILE make -qf /etc/shorewall/Makefile || FAST=
fi fi
if [ -n "$FAST" ]; then if [ -n "$FAST" ]; then