Fix another module loading disaster

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1385 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2004-06-03 03:41:58 +00:00
parent fae0730972
commit df4b75488c
9 changed files with 15 additions and 11 deletions

View File

@ -5952,6 +5952,7 @@ do_initialize() {
# accurately detected when kernel module autoloading is not # accurately detected when kernel module autoloading is not
# enabled. # enabled.
# #
[ -n "$MODULE_SUFFIX" ] || MODULE_SUFFIX="o gz ko o.gz ko.gz"
load_kernel_modules load_kernel_modules
determine_capabilities determine_capabilities
@ -6067,8 +6068,6 @@ do_initialize() {
BRIDGING=$(added_param_value_no BRIDGING $BRIDGING) BRIDGING=$(added_param_value_no BRIDGING $BRIDGING)
DYNAMIC_ZONES=$(added_param_value_no DYNAMIC_ZONES $DYNAMIC_ZONES) DYNAMIC_ZONES=$(added_param_value_no DYNAMIC_ZONES $DYNAMIC_ZONES)
[ -n "$MODULE_SUFFIX" ] || MODULE_SUFFIX="o gz ko o.gz ko.gz"
# #
# Strip the files that we use often # Strip the files that we use often
# #

View File

@ -1 +1 @@
2.0.2e 2.0.2f

View File

@ -74,4 +74,6 @@ Changes since 2.0.1
36) Fix 'newnotsyn' in the hosts file. 36) Fix 'newnotsyn' in the hosts file.
37) Fix double LOG rules in actions. 37) Fix double LOG rules in actions.
38) Another kernel module disaster fixed.

View File

@ -28,7 +28,7 @@
# shown below. Simply run this script to revert to your prior version of # shown below. Simply run this script to revert to your prior version of
# Shoreline Firewall. # Shoreline Firewall.
VERSION=2.0.2e VERSION=2.0.2f
usage() # $1 = exit status usage() # $1 = exit status
{ {

View File

@ -5952,6 +5952,7 @@ do_initialize() {
# accurately detected when kernel module autoloading is not # accurately detected when kernel module autoloading is not
# enabled. # enabled.
# #
[ -n "$MODULE_SUFFIX" ] || MODULE_SUFFIX="o gz ko o.gz ko.gz"
load_kernel_modules load_kernel_modules
determine_capabilities determine_capabilities
@ -6067,8 +6068,6 @@ do_initialize() {
BRIDGING=$(added_param_value_no BRIDGING $BRIDGING) BRIDGING=$(added_param_value_no BRIDGING $BRIDGING)
DYNAMIC_ZONES=$(added_param_value_no DYNAMIC_ZONES $DYNAMIC_ZONES) DYNAMIC_ZONES=$(added_param_value_no DYNAMIC_ZONES $DYNAMIC_ZONES)
[ -n "$MODULE_SUFFIX" ] || MODULE_SUFFIX="o gz ko o.gz ko.gz"
# #
# Strip the files that we use often # Strip the files that we use often
# #

View File

@ -22,7 +22,7 @@
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
# #
VERSION=2.0.2e VERSION=2.0.2f
usage() # $1 = exit status usage() # $1 = exit status
{ {

View File

@ -41,7 +41,9 @@ Problems Corrected since 2.0.2
7) The 'newnotsyn' option in /etc/shorewall/hosts has no effect. 7) The 'newnotsyn' option in /etc/shorewall/hosts has no effect.
8) When used within an action, the LOG target produces two logging 8) When used within an action, the LOG target produces two logging
rules. rules.
9) Kernel Modules loading is still screwed up.
----------------------------------------------------------------------- -----------------------------------------------------------------------
Issues when migrating from Shorewall 2.0.1 to Shorewall 2.0.2: Issues when migrating from Shorewall 2.0.1 to Shorewall 2.0.2:

View File

@ -1,5 +1,5 @@
%define name shorewall %define name shorewall
%define version 2.0.2e %define version 2.0.2f
%define release 1 %define release 1
%define prefix /usr %define prefix /usr
@ -141,6 +141,8 @@ fi
%doc COPYING INSTALL changelog.txt releasenotes.txt tunnel %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel
%changelog %changelog
* Thu Jun 03 2004 Tom Eastep tom@shorewall.net
- Updated for 2.0.2f-1
* Sat May 29 2004 Tom Eastep tom@shorewall.net * Sat May 29 2004 Tom Eastep tom@shorewall.net
- Updated for 2.0.2e-1 - Updated for 2.0.2e-1
* Thu May 27 2004 Tom Eastep tom@shorewall.net * Thu May 27 2004 Tom Eastep tom@shorewall.net

View File

@ -26,7 +26,7 @@
# You may only use this script to uninstall the version # You may only use this script to uninstall the version
# shown below. Simply run this script to remove Seattle Firewall # shown below. Simply run this script to remove Seattle Firewall
VERSION=2.0.2e VERSION=2.0.2f
usage() # $1 = exit status usage() # $1 = exit status
{ {