From 49b8d728257772ce96142bb24696ec236a60e7e6 Mon Sep 17 00:00:00 2001 From: teastep Date: Mon, 9 Apr 2007 18:09:03 +0000 Subject: [PATCH] Move some code to where it belongs (no external impact) git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5878 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall-common/lib.config | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Shorewall-common/lib.config b/Shorewall-common/lib.config index ce315c241..12b0373bb 100644 --- a/Shorewall-common/lib.config +++ b/Shorewall-common/lib.config @@ -1797,12 +1797,6 @@ do_initialize() { # Restore CONFIG_PATH if the shorewall.conf file cleared it # ensure_config_path - # - # Determine the capabilities of the installed iptables/netfilter - # We load the kernel modules here to accurately determine - # capabilities when module autoloading isn't enabled. - # - PKTTYPE=$(added_param_value_no PKTTYPE $PKTTYPE) if [ $PROGRAM = compiler ]; then case "${SHOREWALL_COMPILER:=shell}" in @@ -1832,6 +1826,13 @@ do_initialize() { ;; esac + # + # Determine the capabilities of the installed iptables/netfilter + # We load the kernel modules here to accurately determine + # capabilities when module autoloading isn't enabled. + # + PKTTYPE=$(added_param_value_no PKTTYPE $PKTTYPE) + [ -n "${MODULE_SUFFIX:=o gz ko o.gz ko.gz}" ] if [ -z "$EXPORT" -a $(id -u) -eq 0 ]; then