From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
install/lib/install.lib.php | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php
index 93e5470..c19736a 100644
--- a/install/lib/install.lib.php
+++ b/install/lib/install.lib.php
@@ -200,6 +200,13 @@
$distid = 'debian60';
$distbaseid = 'debian';
swriteln("Operating System: Debian 8.0 (Jessie) or compatible\n");
+ } elseif(strstr(trim(file_get_contents('/etc/debian_version')), '/sid')) {
+ $distname = 'Debian';
+ $distver = 'Testing';
+ $distid = 'debian60';
+ $distconfid = 'debiantesting';
+ $distbaseid = 'debian';
+ swriteln("Operating System: Debian Testing\n");
} else {
$distname = 'Debian';
$distver = 'Unknown';
@@ -289,7 +296,7 @@
} elseif(stristr($content, 'CentOS Linux release 7.2')) {
$distname = 'CentOS';
$distver = 'Unknown';
- $distid = 'centos70';
+ $distid = 'centos72';
$distconfid = 'centos72';
$distbaseid = 'fedora';
swriteln("Operating System: CentOS 7.2\n");
--
Gitblit v1.9.1