diff --git a/createlinks b/createlinks index 0084141..0122a19 100755 --- a/createlinks +++ b/createlinks @@ -19,7 +19,7 @@ for ( qw(install remove update) ) safe_symlink("restart", "root/etc/e-smith/events/dnf-modify/services2adjust/dnf"); -for ( qw(bootstrap-console-save dnf-update smeserver-update-update) ) +for ( qw(bootstrap-console-save dnf-update ) ) { event_link("rpm-import-keys", $_, "10"); } diff --git a/root/usr/lib/systemd/system/dnf.service b/root/usr/lib/systemd/system/dnf.service index ad1193b..4e08281 100644 --- a/root/usr/lib/systemd/system/dnf.service +++ b/root/usr/lib/systemd/system/dnf.service @@ -8,6 +8,7 @@ SyslogIdentifier=dnf_update_dbs ExecStartPre=-/etc/e-smith/events/actions/dnf_modules ExecStartPre=/sbin/e-smith/service-status dnf ExecStart=/sbin/e-smith/dnf_update_dbs +ExecStartPost=/etc/e-smith/events/actions/rpm-import-keys TimeoutSec=0 RemainAfterExit=yes diff --git a/smeserver-update.spec b/smeserver-update.spec index eac9e71..bdb07ba 100644 --- a/smeserver-update.spec +++ b/smeserver-update.spec @@ -2,7 +2,7 @@ Summary: Koozali SME Server rpm updater Name: %{name} %define version 11.0.0 -%define release 23 +%define release 24 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -69,6 +69,9 @@ mkdir -p root/etc/yum.smerepos.d %changelog +* Wed May 28 2025 Jean-Philippe Pialasse 11.0.0-24.sme +- fix not all gpg keys are imported during dnf transaction [SME: 13010] + * Fri Mar 14 2025 Jean-Philippe Pialasse 11.0.0-23.sme - deactivate mariadb 10.5 module (do it on update) [SME: 12955] - rewrite module setting to avoid failure [SME: 12962]