CLOUDSTACK-8443: detect CentOS 7.x as RHEL 7 alike

This commit is contained in:
Remi Bergsma 2015-08-22 22:30:46 +02:00
parent b29ffa2cfe
commit 0a320c18d4

View File

@ -112,7 +112,7 @@ class Distribution:
version = file("/etc/redhat-release").readline() version = file("/etc/redhat-release").readline()
if version.find("Red Hat Enterprise Linux Server release 6") != -1 or version.find("Scientific Linux release 6") != -1 or version.find("CentOS Linux release 6") != -1 or version.find("CentOS release 6.") != -1: if version.find("Red Hat Enterprise Linux Server release 6") != -1 or version.find("Scientific Linux release 6") != -1 or version.find("CentOS Linux release 6") != -1 or version.find("CentOS release 6.") != -1:
self.distro = "RHEL6" self.distro = "RHEL6"
elif version.find("Red Hat Enterprise Linux Server release 7") != -1: elif version.find("Red Hat Enterprise Linux Server release 7") != -1 or version.find("Scientific Linux release 7") != -1 or version.find("CentOS Linux release 7") != -1 or version.find("CentOS release 7.") != -1:
self.distro = "RHEL7" self.distro = "RHEL7"
elif version.find("CentOS release") != -1: elif version.find("CentOS release") != -1:
self.distro = "CentOS" self.distro = "CentOS"