diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt index 794375489..69c34d296 100644 --- a/Shorewall/changelog.txt +++ b/Shorewall/changelog.txt @@ -2,6 +2,8 @@ Changes in 3.2.0 Beta 2 1) Make "shorewall start -f" work correctly. +2) Remove SUBSYSLOCK code from default and debian footers. + Changes in 3.1.x. and 3.2.x 1) Removal of dynamic zones. diff --git a/Shorewall/prog.footer b/Shorewall/prog.footer index 9d752393c..cdd1f2867 100644 --- a/Shorewall/prog.footer +++ b/Shorewall/prog.footer @@ -91,7 +91,6 @@ case "$COMMAND" in progress_message3 "Clearing Shorewall...." clear_firewall status=0 - [ -n "$SUBSYSLOCK" ] && rm -f $SUBSYSLOCK progress_message3 "done." ;; status) diff --git a/Shorewall/prog.footer.debian b/Shorewall/prog.footer.debian index 9d752393c..cdd1f2867 100644 --- a/Shorewall/prog.footer.debian +++ b/Shorewall/prog.footer.debian @@ -91,7 +91,6 @@ case "$COMMAND" in progress_message3 "Clearing Shorewall...." clear_firewall status=0 - [ -n "$SUBSYSLOCK" ] && rm -f $SUBSYSLOCK progress_message3 "done." ;; status) diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index a5a2280fc..69e21a0e9 100644 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -34,6 +34,10 @@ Problems Corrected in 3.2.0 Beta 2 updated to define RESTOREFILE when it invokes 'make' during processing of the "shorewall start -f" command. +2) Code involving SUBSYSLOCK has been removed from the default and Debian + program footers. SUBSYSLOCK only applies to programs installed in + /etc/init.d/. + Migration Considerations: 1) A number of macros have been split into two. The macros affected are: