smeserver/smeserver-update
6
0
Fork 0
generated from smedev/Template-for-SMEServer-Core-Package
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Sat Dec 21 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-17.sme

Browse Source 
- 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]
This commit is contained in:
Jean-Philippe Pialasse
2024-12-21 23:44:40 -05:00
parent 5f44cf7d38
commit 64597f4c33
8 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
root/etc/e-smith/db/yum_repositories/defaults/appstream/Name
View File

@@ -1 +1 @@
Rocky Linux $releasever - AppStream
Rocky Linux - AppStream

2
root/etc/e-smith/db/yum_repositories/defaults/baseos/Name
View File

@@ -1 +1 @@
Rocky Linux $releasever - BaseOS
Rocky Linux - BaseOS

2
root/etc/e-smith/db/yum_repositories/defaults/extras/Name
View File

@@ -1 +1 @@
Rocky Linux $releasever - Extras
Rocky Linux - Extras

2
root/etc/e-smith/db/yum_repositories/defaults/powertools/Name
View File

@@ -1 +1 @@
Rocky Linux $releasever - PowerTools
Rocky Linux - PowerTools

1
root/usr/lib/systemd/system/dnf.service
View File

@@ -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

14
root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/yum.pm
View File

@@ -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');