From 935e6a07b01001f91e9a05fa6a6a05c64b1d73d0 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sat, 7 Apr 2007 16:22:31 +0000
Subject: [PATCH] Patch 3.4.2-1 applied to Shorewall-common

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5837 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall-common/lib.base  | 4 ++++
 Shorewall-common/shorewall | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Shorewall-common/lib.base b/Shorewall-common/lib.base
index a36b49aa5..24d3ff2a4 100644
--- a/Shorewall-common/lib.base
+++ b/Shorewall-common/lib.base
@@ -228,6 +228,8 @@ reload_kernel_modules() {
 	moduleloader=insmod
     fi
 
+    [ -n "${MODULE_SUFFIX:=o gz ko o.gz ko.gz}" ]
+
     [ -z "$MODULESDIR" ] && MODULESDIR=/lib/modules/$(uname -r)/kernel/net/ipv4/netfilter:/lib/modules/$(uname -r)/kernel/net/netfilter
     MODULES=$(lsmod | cut -d ' ' -f1)
 
@@ -257,6 +259,8 @@ load_kernel_modules() # $1 = Yes, if we are to save moduleinfo in $VARDIR
 	moduleloader=insmod
     fi
 
+    [ -n "${MODULE_SUFFIX:=o gz ko o.gz ko.gz}" ]
+
     [ -z "$MODULESDIR" ] && \
 	MODULESDIR=/lib/modules/$(uname -r)/kernel/net/ipv4/netfilter:/lib/modules/$(uname -r)/kernel/net/netfilter
 
diff --git a/Shorewall-common/shorewall b/Shorewall-common/shorewall
index 45516a773..f0cd1cbfd 100755
--- a/Shorewall-common/shorewall
+++ b/Shorewall-common/shorewall
@@ -1061,12 +1061,14 @@ reload_command() # $* = original arguments less the command.
 	if [ -f $directory/shorewall.conf ]; then
 	    MODULESDIR=$(grep '^\s*MODULESDIR=' $directory/shorewall.conf | tail -n 1)
 	    MODULESDIR=${MODULESDIR#*=}
+	    IPTABLES=$(grep '^\s*MODULE_SUFFIX=' $directory/shorewall.conf | tail -n 1)
+	    IPTABLES=${MODULE_SUFFIX#*=}
 	    IPTABLES=$(grep '^\s*IPTABLES=' $directory/shorewall.conf | tail -n 1)
 	    IPTABLES=${IPTABLES#*=}
 	fi
 
 	progress_message "Getting Capabilities on system $system..."
-	if ! ssh ${root}@${system} "MODULESDIR=$MODULESDIR IPTABLES=$IPTABLES /usr/share/shorewall-lite/shorecap > ${LITEDIR}/capabilities" || \
+	if ! ssh ${root}@${system} "MODULESDIR=$MODULESDIR MODULE_SUFFIX=\"$MODULE_SUFFIX\" IPTABLES=$IPTABLES /usr/share/shorewall-lite/shorecap > ${LITEDIR}/capabilities" || \
 	   ! scp ${root}@$system:${LITEDIR}/capabilities $directory; then
 	    fatal_error "ERROR: Capturing capabilities on system $system failed"
 	fi