Skip to content

Commit be2cbbe

Browse files
author
Till Brehm
committed
Updated OS version lists.
1 parent ea39b94 commit be2cbbe

File tree

2 files changed

+42
-0
lines changed

2 files changed

+42
-0
lines changed

install/lib/install.lib.php

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,15 @@ function get_distname() {
8686
$mainver = array_filter($mainver);
8787
$mainver = current($mainver).'.'.next($mainver);
8888
switch ($mainver){
89+
case "14.04":
90+
$relname = "(Trusty Tahr)";
91+
break;
92+
case "13.10":
93+
$relname = "(Saucy Salamander)";
94+
break;
95+
case "13.04":
96+
$relname = "(Raring Ringtail)";
97+
break;
8998
case "12.10":
9099
$relname = "(Quantal Quetzal)";
91100
break;
@@ -246,6 +255,18 @@ function get_distname() {
246255
$distid = 'centos53';
247256
$distbaseid = 'fedora';
248257
swriteln("Operating System: CentOS 5 or compatible\n");
258+
} elseif(stristr($content, 'CentOS Linux release 6')) {
259+
$distname = 'CentOS';
260+
$distver = 'Unknown';
261+
$distid = 'centos53';
262+
$distbaseid = 'fedora';
263+
swriteln("Operating System: CentOS 6 or compatible\n");
264+
} elseif(stristr($content, 'CentOS Linux release 7')) {
265+
$distname = 'CentOS';
266+
$distver = 'Unknown';
267+
$distid = 'centos53';
268+
$distbaseid = 'fedora';
269+
swriteln("Operating System: CentOS 7 or compatible\n");
249270
} else {
250271
$distname = 'Redhat';
251272
$distver = 'Unknown';

server/lib/classes/monitor_tools.inc.php

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,15 @@ public function get_distname() {
6262
$mainver = array_filter($mainver);
6363
$mainver = current($mainver).'.'.next($mainver);
6464
switch ($mainver){
65+
case "14.04":
66+
$relname = "(Trusty Tahr)";
67+
break;
68+
case "13.10":
69+
$relname = "(Saucy Salamander)";
70+
break;
71+
case "13.04":
72+
$relname = "(Raring Ringtail)";
73+
break;
6574
case "12.10":
6675
$relname = "(Quantal Quetzal)";
6776
break;
@@ -201,6 +210,18 @@ public function get_distname() {
201210
$distver = '5.3';
202211
$distid = 'centos53';
203212
$distbaseid = 'fedora';
213+
} elseif(stristr($content, 'CentOS Linux release 6')) {
214+
$distname = 'CentOS';
215+
$distver = 'Unknown';
216+
$distid = 'centos53';
217+
$distbaseid = 'fedora';
218+
swriteln("Operating System: CentOS 6 or compatible\n");
219+
} elseif(stristr($content, 'CentOS Linux release 7')) {
220+
$distname = 'CentOS';
221+
$distver = 'Unknown';
222+
$distid = 'centos53';
223+
$distbaseid = 'fedora';
224+
swriteln("Operating System: CentOS 7 or compatible\n");
204225
} else {
205226
$distname = 'Redhat';
206227
$distver = 'Unknown';

0 commit comments

Comments
 (0)