diff --git a/Shorewall-core/lib.common b/Shorewall-core/lib.common index 27efef069..d1dff907d 100644 --- a/Shorewall-core/lib.common +++ b/Shorewall-core/lib.common @@ -374,7 +374,7 @@ reload_kernel_modules() { moduleloader=insmod fi - [ -n "${MODULE_SUFFIX:=ko ko.gz o o.gz gz}" ] + [ -n "${MODULE_SUFFIX:=ko ko.gz ko.xz o o.gz o.xz gz xz}" ] [ -z "$MODULESDIR" ] && \ uname=$(uname -r) && \ @@ -413,7 +413,7 @@ 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}" ] + [ -n "${MODULE_SUFFIX:=o gz xz ko o.gz o.xz ko.gz ko.xz}" ] [ -z "$MODULESDIR" ] && \ uname=$(uname -r) && \ diff --git a/Shorewall-lite/shorecap b/Shorewall-lite/shorecap index 88cc5e178..b6dde9162 100755 --- a/Shorewall-lite/shorecap +++ b/Shorewall-lite/shorecap @@ -38,7 +38,7 @@ # # IPTABLES - iptables # MODULESDIR - /lib/modules/$(uname -r)/kernel/net/ipv4/netfilter -# MODULE_SUFFIX - "o gz ko o.gz ko.gz" +# MODULE_SUFFIX - "o gz xz ko o.gz o.xz ko.gz ko.xz" # # Shorewall need not be installed on the target system to run shorecap. If the '-e' flag is # used during firewall compilation, then the generated firewall program will likewise not diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm index 041d9676e..14a0b2a03 100644 --- a/Shorewall/Perl/Shorewall/Config.pm +++ b/Shorewall/Perl/Shorewall/Config.pm @@ -3862,7 +3862,7 @@ sub load_kernel_modules( ) { close LSMOD; - $config{MODULE_SUFFIX} = 'o gz ko o.gz ko.gz' unless $config{MODULE_SUFFIX}; + $config{MODULE_SUFFIX} = 'o gz xz ko o.gz o.xz ko.gz ko.xz' unless $config{MODULE_SUFFIX}; my @suffixes = split /\s+/ , $config{MODULE_SUFFIX}; diff --git a/Shorewall/manpages/shorewall.conf.xml b/Shorewall/manpages/shorewall.conf.xml index 0a1325b31..2150c3950 100644 --- a/Shorewall/manpages/shorewall.conf.xml +++ b/Shorewall/manpages/shorewall.conf.xml @@ -1784,8 +1784,8 @@ LOG:info:,bar net fw The value of this option determines the possible file - extensions of kernel modules. The default value is "ko ko.gz o o.gz - gz". + extensions of kernel modules. The default value is "ko ko.gz ko.xz o o.gz + o.xz gz xz". diff --git a/Shorewall6-lite/shorecap b/Shorewall6-lite/shorecap index c41536256..b73e9ba29 100755 --- a/Shorewall6-lite/shorecap +++ b/Shorewall6-lite/shorecap @@ -38,7 +38,7 @@ # # IPTABLES - iptables # MODULESDIR - /lib/modules/$(uname -r)/kernel/net/ipv4/netfilter -# MODULE_SUFFIX - "o gz ko o.gz ko.gz" +# MODULE_SUFFIX - "o gz xz ko o.gz o.xz ko.gz ko.xz" # # Shorewall need not be installed on the target system to run shorecap. If the '-e' flag is # used during firewall compilation, then the generated firewall program will likewise not diff --git a/Shorewall6/manpages/shorewall6.conf.xml b/Shorewall6/manpages/shorewall6.conf.xml index be535f1e4..a74550b14 100644 --- a/Shorewall6/manpages/shorewall6.conf.xml +++ b/Shorewall6/manpages/shorewall6.conf.xml @@ -1588,8 +1588,8 @@ LOG:info:,bar net fw The value of this option determines the possible file - extensions of kernel modules. The default value is "ko ko.gz o o.gz - gz". + extensions of kernel modules. The default value is "ko ko.gz ko.xz o o.gz + o.xz gz xz".