From fd759c60dfa5fafba54fc17b1f3dba8a65c3f728 Mon Sep 17 00:00:00 2001 From: Edison Su Date: Thu, 15 Sep 2011 14:34:00 -0700 Subject: [PATCH] bug 11458: stop cgconfig before start libvirtd, "service cgconfig status" returns "Running" instead of "running", then cloud-setup-agent doesn't stop it status 11458: resolved fixed --- python/lib/cloudutils/serviceConfig.py | 4 ++-- python/lib/cloudutils/utilities.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/python/lib/cloudutils/serviceConfig.py b/python/lib/cloudutils/serviceConfig.py index 256866b45e9..12b8bea0fa3 100755 --- a/python/lib/cloudutils/serviceConfig.py +++ b/python/lib/cloudutils/serviceConfig.py @@ -296,14 +296,14 @@ class cgroupConfig(serviceCfgBase): }\n" cfo.add_lines(addConfig) - self.syscfg.svo.stopService("cgconfig") + self.syscfg.svo.stopService("cgconfig", True) self.syscfg.svo.enableService("cgconfig",forcestart=True) cfo = configFileOps("/etc/cgrules.conf", self) cfgline = "root:/usr/sbin/libvirtd cpu virt/\n" cfo.add_lines(cfgline) - self.syscfg.svo.stopService("cgred") + self.syscfg.svo.stopService("cgred", True) if not self.syscfg.svo.enableService("cgred"): return False return True diff --git a/python/lib/cloudutils/utilities.py b/python/lib/cloudutils/utilities.py index 9215ffeb039..f6e7e5cfac9 100755 --- a/python/lib/cloudutils/utilities.py +++ b/python/lib/cloudutils/utilities.py @@ -120,7 +120,7 @@ class serviceOpsRedhat(serviceOps): def isServiceRunning(self, servicename): try: o = bash("service " + servicename + " status") - if "running" in o.getStdout() or "start" in o.getStdout(): + if "running" in o.getStdout() or "start" in o.getStdout() or "Running" in o.getStdout(): return True else: return False