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

remibergsma · remibergsma · commit ca860348dcdc · 2015-11-09T16:54:38.000+01:00
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 &lt;github@remi.nl&gt;
diff --git a/python/lib/cloud_utils.py b/python/lib/cloud_utils.py
@@ -68,7 +68,7 @@
     version = file("/etc/redhat-release").readline()
     if version.find("Red Hat Enterprise Linux Server release 6") != -1:
         distro = RHEL6
-    elif version.find("CentOS release") != -1:
+    elif version.find("CentOS") != -1:
         distro = CentOS
     else:
         distro = CentOS
diff --git a/python/lib/cloudutils/utilities.py b/python/lib/cloudutils/utilities.py
@@ -114,7 +114,7 @@ def __init__(self):
                 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:
                 self.distro = "RHEL7"
-            elif version.find("CentOS release") != -1:
+            elif version.find("CentOS") != -1:
                 self.distro = "CentOS"
             else:
                 self.distro = "RHEL5"
diff --git a/scripts/vm/hypervisor/versions.sh b/scripts/vm/hypervisor/versions.sh
@@ -32,7 +32,7 @@ CODENAME=""
 if [ -f /etc/redhat-release ] ; then
 	DIST=`cat /etc/redhat-release | awk '{print $1}'`
 	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
 	DIST=`cat /etc/lsb-release | grep DISTRIB_ID | tr "\n" ' '| sed s/.*=//`
 	REV=`cat /etc/lsb-release | grep DISTRIB_RELEASE | tr "\n" ' '| sed s/.*=//`
