From c1535d34931d15f14a601f933c07eb6dbda970a2 Mon Sep 17 00:00:00 2001 From: Sroka Date: Sat, 12 Dec 2020 17:16:16 +0100 Subject: [PATCH 1/3] Do OS-Update for Redhat family --- server/mods-available/remoteaction_core_module.inc.php | 5 +++-- server/plugins-available/software_update_plugin.inc.php | 5 +++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/server/mods-available/remoteaction_core_module.inc.php b/server/mods-available/remoteaction_core_module.inc.php index eea8fd6941..1c1e18d87e 100644 --- a/server/mods-available/remoteaction_core_module.inc.php +++ b/server/mods-available/remoteaction_core_module.inc.php @@ -181,8 +181,9 @@ class remoteaction_core_module { exec("glsa-check -f --nocolor affected"); } elseif(file_exists('/etc/redhat-release')) { exec("dnf -y update"); - } - else { + } elseif(file_exists('/etc/redhat-release')) { + exec("dnf -y update"); + } else { exec("apt-get update"); exec("apt-get -y upgrade"); } diff --git a/server/plugins-available/software_update_plugin.inc.php b/server/plugins-available/software_update_plugin.inc.php index 2626d1e756..29393edf3c 100644 --- a/server/plugins-available/software_update_plugin.inc.php +++ b/server/plugins-available/software_update_plugin.inc.php @@ -289,6 +289,11 @@ class software_update_plugin { $app->log('Execeuted Debian / Ubuntu update', LOGLEVEL_DEBUG); } + //** Redhat, CentOS, Fedora + if(file_exists('/etc/redhat-release')) { + exec("dnf -y update"); + } + //** Gentoo Linux if(file_exists('/etc/gentoo-release')) { exec("glsa-check -f --nocolor affected"); -- GitLab From 8b949e731941bbf43fe516df6bba9e5dad77007b Mon Sep 17 00:00:00 2001 From: Sroka Date: Sat, 12 Dec 2020 18:53:30 +0100 Subject: [PATCH 2/3] Do OS-Update for Redhat family - add CentOS7 yum --- server/plugins-available/software_update_plugin.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/plugins-available/software_update_plugin.inc.php b/server/plugins-available/software_update_plugin.inc.php index 29393edf3c..211951685d 100644 --- a/server/plugins-available/software_update_plugin.inc.php +++ b/server/plugins-available/software_update_plugin.inc.php @@ -291,7 +291,7 @@ class software_update_plugin { //** Redhat, CentOS, Fedora if(file_exists('/etc/redhat-release')) { - exec("dnf -y update"); + exec("which dnf &> /dev/null && dnf -y update || yum -y update"); } //** Gentoo Linux -- GitLab From 8a5fbd6f12e8489542134124a5e4b5d0b67aac92 Mon Sep 17 00:00:00 2001 From: Sroka Date: Sat, 12 Dec 2020 18:54:46 +0100 Subject: [PATCH 3/3] Do OS-Update for Redhat family - add CentOS7 yum --- server/mods-available/remoteaction_core_module.inc.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/server/mods-available/remoteaction_core_module.inc.php b/server/mods-available/remoteaction_core_module.inc.php index 1c1e18d87e..56cc3745c2 100644 --- a/server/mods-available/remoteaction_core_module.inc.php +++ b/server/mods-available/remoteaction_core_module.inc.php @@ -180,9 +180,7 @@ class remoteaction_core_module { if(file_exists('/etc/gentoo-release')) { exec("glsa-check -f --nocolor affected"); } elseif(file_exists('/etc/redhat-release')) { - exec("dnf -y update"); - } elseif(file_exists('/etc/redhat-release')) { - exec("dnf -y update"); + exec("which dnf &> /dev/null && dnf -y update || yum -y update"); } else { exec("apt-get update"); exec("apt-get -y upgrade"); -- GitLab