From 43c2f122c7111cb4cb5ca8417df93eed0e9e82ae Mon Sep 17 00:00:00 2001 From: Mab 974 Date: Tue, 21 Feb 2023 13:41:59 +0400 Subject: [PATCH] v1.3.1-20 - load module --- smeserver-xt_geoip-1.3.1/createlinks | 7 ++++++- .../root/etc/e-smith/events/actions/xt_geoip_kmod | 6 ++++++ .../root/etc/yum/post-actions/xt_geoip.action | 4 ++++ smeserver-xt_geoip.spec | 5 ++++- 4 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 smeserver-xt_geoip-1.3.1/root/etc/e-smith/events/actions/xt_geoip_kmod create mode 100644 smeserver-xt_geoip-1.3.1/root/etc/yum/post-actions/xt_geoip.action diff --git a/smeserver-xt_geoip-1.3.1/createlinks b/smeserver-xt_geoip-1.3.1/createlinks index b9608b5..90ff784 100644 --- a/smeserver-xt_geoip-1.3.1/createlinks +++ b/smeserver-xt_geoip-1.3.1/createlinks @@ -32,12 +32,16 @@ for my $event (qw(xt_geoip-service)) } # actions to perform - for my $event (qw(xt_geoip-update bootstrap-console-save console-save smeserver-xt_geoip-update)) { event_link("smeserver-xt_geoip-download-action", $event, "10"); } +for my $event (qw(bootstrap-console-save e-smith-packetfilter-update + smeserver-xt_geoip-update remote-access-update)) +{ + event_link("xt_geoip_kmod", $event, "15"); +} # for smeserver-manager my $event= "smeserver-xt_geoip-update"; @@ -46,6 +50,7 @@ event_link('navigation2-conf', "$event", '80'); event_link('routes2-conf', "$event", '80'); event_link('locales2-conf', "$event", '80'); +# backup use esmith::Build::Backup qw(:all); backup_includes("smeserver-xt_geoip", qw( /usr/share/xt_geoip/BE/ diff --git a/smeserver-xt_geoip-1.3.1/root/etc/e-smith/events/actions/xt_geoip_kmod b/smeserver-xt_geoip-1.3.1/root/etc/e-smith/events/actions/xt_geoip_kmod new file mode 100644 index 0000000..d309b6c --- /dev/null +++ b/smeserver-xt_geoip-1.3.1/root/etc/e-smith/events/actions/xt_geoip_kmod @@ -0,0 +1,6 @@ +#!/bin/bash + +modprobe -r xt_geoip +weak-modules --add-kernel +modprobe xt_geoip + diff --git a/smeserver-xt_geoip-1.3.1/root/etc/yum/post-actions/xt_geoip.action b/smeserver-xt_geoip-1.3.1/root/etc/yum/post-actions/xt_geoip.action new file mode 100644 index 0000000..7f437d6 --- /dev/null +++ b/smeserver-xt_geoip-1.3.1/root/etc/yum/post-actions/xt_geoip.action @@ -0,0 +1,4 @@ +kernel*:any:/etc/e-smith/events/actions/xt_geoip_kmod +kmod*:any:/etc/e-smith/events/actions/xt_geoip_kmod +xtables-addons*:any:/etc/e-smith/events/actions/xt_geoip_kmod + diff --git a/smeserver-xt_geoip.spec b/smeserver-xt_geoip.spec index e3e6652..fe925e7 100644 --- a/smeserver-xt_geoip.spec +++ b/smeserver-xt_geoip.spec @@ -1,6 +1,6 @@ %define name smeserver-xt_geoip %define version 1.3.1 -%define release 19 +%define release 20 Summary: smserver rpm to setup database, update and configuration for xt_geoip module with a panel. Name: %{name} @@ -67,6 +67,9 @@ rm -rf %{name}-%{version} %changelog +* Wed Feb 15 2023 Michel Begue 1.3.1-20.sme +- fix module not loaded after update [SME: 10793] + * Wed Feb 08 2023 Michel Begue 1.3.1-19.sme - no patch infos here in .spec ( F A K E ) [SME: ]