diff --git a/createlinks b/createlinks index b47ff91..27221d2 100755 --- a/createlinks +++ b/createlinks @@ -24,6 +24,11 @@ for ( qw(bootstrap-console-save dnf-update smeserver-update-update) ) event_link("rpm-import-keys", $_, "10"); } +for ( qw(post-install post-upgrade console-save)) +{ + event_link("dnf_modules", $_, "70"); +} + my $event= "smeserver-update-update"; # systemd-specific action mandatory for this package-update event event_link("systemd-reload", $event, "89"); @@ -31,8 +36,6 @@ event_link("systemd-default", $event, "88"); templates2events("/etc/rsyslog.conf",$event); safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/rsyslog"); -event_link("dnf_modules", 'post-install', "70"); - #-------------------------------------------------- # functions for manager panel #-------------------------------------------------- diff --git a/root/etc/e-smith/db/yum_repositories/defaults/appstream/Name b/root/etc/e-smith/db/yum_repositories/defaults/appstream/Name index 6ce65b3..7d21032 100644 --- a/root/etc/e-smith/db/yum_repositories/defaults/appstream/Name +++ b/root/etc/e-smith/db/yum_repositories/defaults/appstream/Name @@ -1 +1 @@ -Rocky Linux $releasever - AppStream +Rocky Linux - AppStream diff --git a/root/etc/e-smith/db/yum_repositories/defaults/baseos/Name b/root/etc/e-smith/db/yum_repositories/defaults/baseos/Name index 580e76c..970cbf4 100644 --- a/root/etc/e-smith/db/yum_repositories/defaults/baseos/Name +++ b/root/etc/e-smith/db/yum_repositories/defaults/baseos/Name @@ -1 +1 @@ -Rocky Linux $releasever - BaseOS +Rocky Linux - BaseOS diff --git a/root/etc/e-smith/db/yum_repositories/defaults/extras/Name b/root/etc/e-smith/db/yum_repositories/defaults/extras/Name index 594fc8c..2235ace 100644 --- a/root/etc/e-smith/db/yum_repositories/defaults/extras/Name +++ b/root/etc/e-smith/db/yum_repositories/defaults/extras/Name @@ -1 +1 @@ -Rocky Linux $releasever - Extras +Rocky Linux - Extras diff --git a/root/etc/e-smith/db/yum_repositories/defaults/powertools/Name b/root/etc/e-smith/db/yum_repositories/defaults/powertools/Name index ef64cf9..b0f691b 100644 --- a/root/etc/e-smith/db/yum_repositories/defaults/powertools/Name +++ b/root/etc/e-smith/db/yum_repositories/defaults/powertools/Name @@ -1 +1 @@ -Rocky Linux $releasever - PowerTools +Rocky Linux - PowerTools diff --git a/root/usr/lib/systemd/system/dnf.service b/root/usr/lib/systemd/system/dnf.service index fe18abf..ad1193b 100644 --- a/root/usr/lib/systemd/system/dnf.service +++ b/root/usr/lib/systemd/system/dnf.service @@ -5,6 +5,7 @@ After=network-pre.target networking.service [Service] Type=forking 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 TimeoutSec=0 diff --git a/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/yum.pm b/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/yum.pm index 5ea807e..22924f3 100644 --- a/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/yum.pm +++ b/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/yum.pm @@ -180,7 +180,7 @@ sub get_status { my ($fm, $prop, $localise) = @_; - my $status = $db->get_prop("yum", $prop) || 'disabled'; + my $status = $db->get_prop("dnf", $prop) || 'disabled'; return $status unless $localise; @@ -196,7 +196,7 @@ sub change_settings PackageFunctions ) ) { - $db->set_prop('yum', $param, $q->param("yum_$param")); + $db->set_prop('dnf', $param, $q->param("yum_$param")); } my $check4updates = $q->param("yum_check4updates"); @@ -204,21 +204,21 @@ sub change_settings if ($check4updates ne 'disabled') { $status = 'enabled'; } - $db->set_prop('yum', 'check4updates', $check4updates); + $db->set_prop('dnf', 'check4updates', $check4updates); my $deltarpm = $q->param("yum_DeltaRpmProcess"); - $db->set_prop('yum', 'DeltaRpmProcess', $deltarpm); + $db->set_prop('dnf', 'DeltaRpmProcess', $deltarpm); my $downloadonly = $q->param("yum_DownloadOnly"); if ($downloadonly ne 'disabled') { $status = 'enabled'; } - $db->set_prop('yum', 'DownloadOnly', $downloadonly); + $db->set_prop('dnf', 'DownloadOnly', $downloadonly); my $AutoInstallUpdates = $q->param("yum_AutoInstallUpdates"); if ($AutoInstallUpdates ne 'disabled') { $status = 'enabled'; } - $db->set_prop('yum', 'AutoInstallUpdates', $AutoInstallUpdates); - $db->set_prop('yum', 'status', $status); + $db->set_prop('dnf', 'AutoInstallUpdates', $AutoInstallUpdates); + $db->set_prop('dnf', 'status', $status); my %selected = map {$_ => 1} $q->param('SelectedRepositories'); diff --git a/smeserver-update.spec b/smeserver-update.spec index 632ab62..e616611 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 16 +%define release 17 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -68,6 +68,11 @@ mkdir -p root/etc/yum.smerepos.d %changelog +* Sat Dec 21 2024 Jean-Philippe Pialasse 11.0.0-17.sme +- set our prefered modules on different events and dnf.service run [SME: 12618] +- update old manager to use dnf key instead of yum for settings [SME: 12831] +- clean rocky yum_repositories property Name content [SME: 12806] + * Sat Nov 30 2024 Jean-Philippe Pialasse 11.0.0-16.sme - remove smeupdates and add smecontribs-testing [SME: 12804]