From 93fa580e8ec7e202c7fc56dec9b121d1e12d1c35 Mon Sep 17 00:00:00 2001 From: Till Brehm Date: Thu, 5 Oct 2017 17:25:33 +0200 Subject: [PATCH] Fixed CentOS 6 version detection code. --- install/lib/install.lib.php | 2 +- server/lib/classes/monitor_tools.inc.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php index 5c5bdc7a0..1bb366fc6 100644 --- a/install/lib/install.lib.php +++ b/install/lib/install.lib.php @@ -307,7 +307,7 @@ function get_distname() { $distid = 'centos53'; $distbaseid = 'fedora'; swriteln("Operating System: CentOS 5 or compatible\n"); - } elseif(stristr($content, 'CentOS Linux release 6')) { + } elseif(stristr($content, 'CentOS Linux release 6') || stristr($content, 'CentOS release 6')) { $distname = 'CentOS'; $distver = 'Unknown'; $distid = 'centos53'; diff --git a/server/lib/classes/monitor_tools.inc.php b/server/lib/classes/monitor_tools.inc.php index 3ff25c01e..30b1d477d 100644 --- a/server/lib/classes/monitor_tools.inc.php +++ b/server/lib/classes/monitor_tools.inc.php @@ -278,7 +278,7 @@ class monitor_tools { $distver = 'Unknown'; $distid = 'centos53'; $distbaseid = 'fedora'; - } elseif(stristr($content, 'CentOS Linux release 6')) { + } elseif(stristr($content, 'CentOS Linux release 6') || stristr($content, 'CentOS release 6')) { $distname = 'CentOS'; $distver = 'Unknown'; $distid = 'centos53'; -- GitLab