Use modules file in export directory if any

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4997 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb

Shorewall/changelog.txt

@@ -4,6 +4,8 @@ Changes in 3.3.6
 
 2)  Remove /usr/share/shorewall/help.
 
+3)  Use export directory's modules file with -e.
+
 Changes in 3.3.5
 
 1)  Restore default route when there are no 'balance' providers.

Shorewall/compiler

@@ -5134,7 +5134,21 @@ __EOF__
 
     save_progress_message "Initializing..."
 
-    save_command load_kernel_modules
+    if [ -n "$EXPORT" -a -n "$SHOREWALL_DIR" ]; then
+	f=$SHOREWALL_DIR/modules
+
+	if [ -f $f ]; then
+	    save_command 'echo MODULESDIR="$MODULESDIR" > ${VARDIR}/.modulesdir'
+	    save_command "cat > \${VARDIR}/.modules $LEFTSHIFT EOF"
+	    grep loadmodule $f | sed 's/^\s*//' >&3
+	    save_command_unindented EOF
+	    save_command "reload_kernel_modules < \${VARDIR}/.modules"
+	else
+	    save_command load_kernel_modules
+	fi
+    else
+	save_command load_kernel_modules
+    fi
 
     for interface in $ALL_INTERFACES; do
 	if interface_has_option $interface norfc1918; then

Shorewall/releasenotes.txt

@@ -43,6 +43,13 @@ Other Changes in 3.3.6
     Command-specific help has also been removed since it duplicates
     information in the man pages.
 
+2)  Prior to this release, on firewall systems with Shorewall Lite
+    installed, the local modules file is used to load kernel
+    modules. Beginning with this release, if there is a 'modules' file
+    in the CONFIG_PATH when the firewall script is compiled, then that
+    file will be copied into the compiled script and used on the
+    firewall system.
+
 Migration Considerations:
 
 1)  Shorewall supports the notion of "default actions". A default