cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [2/2] git commit: updated refs/heads/4.5 to 43dabb6
Date Wed, 19 Aug 2015 17:37:27 GMT
RHEL 7 and CentOS 7 need the same fix

(cherry picked from commit d1cb4c7d501eb7e37d04bc99b0482c28c8bec38b)
Signed-off-by: Remi Bergsma <github@remi.nl>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/43dabb61
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/43dabb61
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/43dabb61

Branch: refs/heads/4.5
Commit: 43dabb611da87c5f9022ec41be6a1bdba1508c0f
Parents: 91cfb60
Author: Remi Bergsma <github@remi.nl>
Authored: Wed Aug 19 16:26:48 2015 +0200
Committer: Remi Bergsma <github@remi.nl>
Committed: Wed Aug 19 19:35:38 2015 +0200

----------------------------------------------------------------------
 scripts/vm/hypervisor/kvm/setup-cgroups.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/43dabb61/scripts/vm/hypervisor/kvm/setup-cgroups.sh
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/kvm/setup-cgroups.sh b/scripts/vm/hypervisor/kvm/setup-cgroups.sh
index d3342c0..6b00b02 100755
--- a/scripts/vm/hypervisor/kvm/setup-cgroups.sh
+++ b/scripts/vm/hypervisor/kvm/setup-cgroups.sh
@@ -19,7 +19,7 @@
 
 
 # Script to fix cgroups co-mounted issue
-# Applies to RHEL7 versions only
+# Applies to RHEL 7 versions (and family member CentOS 7) only
 # Detect if cpu,cpuacct cgroups are co-mounted
 # If co-mounted, unmount and mount them seperately
 
@@ -28,7 +28,7 @@
 # Check distribution version for RHEL
 if [ -f '/etc/redhat-release' ]; then
     # Check RHEL version for 7
-    if grep 'Red Hat Enterprise Linux Server release 7' /etc/redhat-release > /dev/null;
then
+    if grep -E 'Red Hat Enterprise Linux Server release 7|CentOS Linux release 7' /etc/redhat-release
> /dev/null; then
         # Check if cgroups if co-mounted
         if [ -d '/sys/fs/cgroup/cpu,cpuacct' ]; then
             # cgroups co-mounted. Requires remount


Mime
View raw message