Skip to content

Commit e13f43c

Browse files
author
Till Brehm
committed
Fixed #5250 Error in Debian version detection code
1 parent c0b64b2 commit e13f43c

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

install/lib/install.lib.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,13 +214,13 @@ function get_distname() {
214214
$distid = 'debian60';
215215
$distbaseid = 'debian';
216216
swriteln("Operating System: Debian 7.0 (Wheezy/Sid) or compatible\n");
217-
} elseif(strstr(trim(file_get_contents('/etc/debian_version')), '8') || substr(trim(file_get_contents('/etc/debian_version')),0,1) == '8') {
217+
} elseif(substr(trim(file_get_contents('/etc/debian_version')),0,1) == '8') {
218218
$distname = 'Debian';
219219
$distver = 'Jessie';
220220
$distid = 'debian60';
221221
$distbaseid = 'debian';
222222
swriteln("Operating System: Debian 8.0 (Jessie) or compatible\n");
223-
} elseif(strstr(trim(file_get_contents('/etc/debian_version')), '9') || substr(trim(file_get_contents('/etc/debian_version')),0,1) == '9') {
223+
} elseif(substr(trim(file_get_contents('/etc/debian_version')),0,1) == '9') {
224224
$distname = 'Debian';
225225
$distver = 'Stretch';
226226
$distconfid = 'debian90';

server/lib/classes/monitor_tools.inc.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,12 +200,12 @@ function get_distname() {
200200
$distver = 'Wheezy/Sid';
201201
$distid = 'debian60';
202202
$distbaseid = 'debian';
203-
} elseif(strstr(trim(file_get_contents('/etc/debian_version')), '8') || substr(trim(file_get_contents('/etc/debian_version')),0,1) == '8') {
203+
} elseif(substr(trim(file_get_contents('/etc/debian_version')),0,1) == '8') {
204204
$distname = 'Debian';
205205
$distver = 'Jessie';
206206
$distid = 'debian60';
207207
$distbaseid = 'debian';
208-
} elseif(strstr(trim(file_get_contents('/etc/debian_version')), '9') || substr(trim(file_get_contents('/etc/debian_version')),0,1) == '9') {
208+
} elseif(substr(trim(file_get_contents('/etc/debian_version')),0,1) == '9') {
209209
$distname = 'Debian';
210210
$distver = 'Stretch';
211211
$distconfid = 'debian90';

0 commit comments

Comments
 (0)