holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Speed up module loading

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3927 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-05-20 16:01:22 +00:00
parent 5342125a6f
commit 88ae2575df
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Shorewall/changelog.txt
View File

@ -6,6 +6,7 @@ Changes in 3.2.0 Beta 8
3) Add xmodules file. 3) Add xmodules file.
-------------------------------------------------------------------------------
Changes in 3.2.0 Beta 7 Changes in 3.2.0 Beta 7
1) Fix mark/mask validation. 1) Fix mark/mask validation.
@ -16,6 +17,7 @@ Changes in 3.2.0 Beta 7
4) Avoid fatal error after missing forwardUPnP rule warning. 4) Avoid fatal error after missing forwardUPnP rule warning.
-------------------------------------------------------------------------------
Changes in 3.2.0 Beta 6 Changes in 3.2.0 Beta 6
1) Fix tc "notfound" errors when 'restart' is run out of ip-up.local. 1) Fix tc "notfound" errors when 'restart' is run out of ip-up.local.
@ -30,6 +32,7 @@ Changes in 3.2.0 Beta 6
6) Change interraction of 'track' and PREROUTING marking. 6) Change interraction of 'track' and PREROUTING marking.
-------------------------------------------------------------------------------
Changes in 3.2.0 Beta 5 Changes in 3.2.0 Beta 5
1) Fix compilation problem on LEAF Bering. 1) Fix compilation problem on LEAF Bering.
@ -49,6 +52,7 @@ Changes in 3.2.0 Beta 5
8) Clear SUBSYSLOCK on Debian/Ubuntu installs. 8) Clear SUBSYSLOCK on Debian/Ubuntu installs.
-------------------------------------------------------------------------------
Changes in 3.2.0 Beta 4 Changes in 3.2.0 Beta 4
1) Fix 'routeback' with bridge ports. 1) Fix 'routeback' with bridge ports.
@ -67,6 +71,7 @@ Changes in 3.2.0 Beta 3
3) Fix SAME/ADD_SNAT_ALIASES interaction. 3) Fix SAME/ADD_SNAT_ALIASES interaction.
-------------------------------------------------------------------------------
Changes in 3.2.0 Beta 2 Changes in 3.2.0 Beta 2
1) Make "shorewall start -f" work correctly. 1) Make "shorewall start -f" work correctly.
@ -77,6 +82,7 @@ Changes in 3.2.0 Beta 2
4) Implement 'logdrop' and 'logreject' 4) Implement 'logdrop' and 'logreject'
-------------------------------------------------------------------------------
Changes in 3.1.x. and 3.2.x Changes in 3.1.x. and 3.2.x
1) Removal of dynamic zones. 1) Removal of dynamic zones.

7
Shorewall/functions
View File

@ -375,7 +375,7 @@ loadmodule() # $1 = module name, $2 - * arguments
moduleloader=insmod moduleloader=insmod
fi fi
if [ -z "$(lsmod | grep $modulename)" ]; then if ! list_search $modulename $MODULES ; then
shift shift
for suffix in $MODULE_SUFFIX ; do for suffix in $MODULE_SUFFIX ; do
@ -391,7 +391,8 @@ loadmodule() # $1 = module name, $2 - * arguments
;; ;;
esac esac
return MODULES=$(lsmod | cut -d ' ' -f1)
break
fi fi
done done
fi fi
@ -403,6 +404,7 @@ loadmodule() # $1 = module name, $2 - * arguments
reload_kernel_modules() { reload_kernel_modules() {
[ -z "$MODULESDIR" ] && MODULESDIR=/lib/modules/$(uname -r)/kernel/net/ipv4/netfilter [ -z "$MODULESDIR" ] && MODULESDIR=/lib/modules/$(uname -r)/kernel/net/ipv4/netfilter
MODULES=$(lsmod | cut -d ' ' -f1)
while read command; do while read command; do
eval $command eval $command
@ -423,6 +425,7 @@ load_kernel_modules()
modules=$(find_file modules) modules=$(find_file modules)
if [ -f $modules -a -d $MODULESDIR ]; then if [ -f $modules -a -d $MODULESDIR ]; then
MODULES=$(lsmod | cut -d ' ' -f1)
progress_message "Loading Modules..." progress_message "Loading Modules..."
. $modules . $modules
fi fi