apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1033 from Carles-Figuerola/centos-7-redhat-release

Browse Source 
CLOUDSTACK-9029: Proper support to identify CentOS 7 version numberhttps://issues.apache.org/jira/browse/CLOUDSTACK-9029

* pr/1033:
  CLOUDSTACK-9029: Proper support to identify CentOS 7 version number

Signed-off-by: Remi Bergsma <github@remi.nl>
This commit is contained in:
Remi Bergsma 2015-11-09 16:54:35 +01:00
commit ca860348dc
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/lib/cloud_utils.py
View File

@ -68,7 +68,7 @@ elif os.path.exists("/etc/redhat-release"):
version = file("/etc/redhat-release").readline() version = file("/etc/redhat-release").readline()
if version.find("Red Hat Enterprise Linux Server release 6") != -1: if version.find("Red Hat Enterprise Linux Server release 6") != -1:
distro = RHEL6 distro = RHEL6
elif version.find("CentOS release") != -1: elif version.find("CentOS") != -1:
distro = CentOS distro = CentOS
else: else:
distro = CentOS distro = CentOS

2
python/lib/cloudutils/utilities.py
View File

@ -114,7 +114,7 @@ class Distribution:
self.distro = "RHEL6" self.distro = "RHEL6"
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: 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") != -1:
self.distro = "CentOS" self.distro = "CentOS"
else: else:
self.distro = "RHEL5" self.distro = "RHEL5"

2
scripts/vm/hypervisor/versions.sh
View File

@ -32,7 +32,7 @@ CODENAME=""
if [ -f /etc/redhat-release ] ; then if [ -f /etc/redhat-release ] ; then
DIST=`cat /etc/redhat-release | awk '{print $1}'` DIST=`cat /etc/redhat-release | awk '{print $1}'`
CODENAME=`cat /etc/redhat-release | sed s/.*\(// | sed s/\)//` CODENAME=`cat /etc/redhat-release | sed s/.*\(// | sed s/\)//`
REV=`cat /etc/redhat-release | awk '{print $3}'` REV=`cat /etc/redhat-release | awk '{print $3,$4}' | grep -o "[0-9.]*"`
elif [ -f /etc/lsb-release ] ; then elif [ -f /etc/lsb-release ] ; then
DIST=`cat /etc/lsb-release | grep DISTRIB_ID | tr "\n" ' '| sed s/.*=//` DIST=`cat /etc/lsb-release | grep DISTRIB_ID | tr "\n" ' '| sed s/.*=//`
REV=`cat /etc/lsb-release | grep DISTRIB_RELEASE | tr "\n" ' '| sed s/.*=//` REV=`cat /etc/lsb-release | grep DISTRIB_RELEASE | tr "\n" ' '| sed s/.*=//`