From 34e4fffd7d69a3780f10f851a6f4e30ca18f39e1 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Mon, 21 Aug 2017 12:44:23 -0700 Subject: [PATCH] Module suffix changes - Re-order default list in the compiler to match lib.common - MODULE_SUFFIX="ko ko.xz" in standard .conf files. Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/Config.pm | 2 +- Shorewall/configfiles/shorewall.conf | 2 +- Shorewall6/configfiles/shorewall6.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm index 0ed8d7ac3..e7c8373a1 100644 --- a/Shorewall/Perl/Shorewall/Config.pm +++ b/Shorewall/Perl/Shorewall/Config.pm @@ -4320,7 +4320,7 @@ sub load_kernel_modules( ) { close LSMOD; - $config{MODULE_SUFFIX} = 'o gz xz ko o.gz o.xz ko.gz ko.xz' unless $config{MODULE_SUFFIX}; + $config{MODULE_SUFFIX} = 'ko ko.gz ko.xz o o.gz o.xz gz xz' unless $config{MODULE_SUFFIX}; my @suffixes = split /\s+/ , $config{MODULE_SUFFIX}; diff --git a/Shorewall/configfiles/shorewall.conf b/Shorewall/configfiles/shorewall.conf index 977e650d5..2a48e7071 100644 --- a/Shorewall/configfiles/shorewall.conf +++ b/Shorewall/configfiles/shorewall.conf @@ -205,7 +205,7 @@ MARK_IN_FORWARD_CHAIN=No MINIUPNPD=No -MODULE_SUFFIX=ko +MODULE_SUFFIX="ko ko.xz" MULTICAST=No diff --git a/Shorewall6/configfiles/shorewall6.conf b/Shorewall6/configfiles/shorewall6.conf index 6992b9b38..8a16d1bc8 100644 --- a/Shorewall6/configfiles/shorewall6.conf +++ b/Shorewall6/configfiles/shorewall6.conf @@ -190,7 +190,7 @@ MARK_IN_FORWARD_CHAIN=No MINIUPNPD=No -MODULE_SUFFIX=ko +MODULE_SUFFIX="ko ko.xz" MUTEX_TIMEOUT=60