From 0e774ad3126fdbd45e54d482e8b44f7c8ecfe208 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Wed, 2 May 2007 14:30:30 +0000 Subject: Make service supervision explicit git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@3078 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Client/Tools/Chkconfig.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'src/lib/Client/Tools/Chkconfig.py') diff --git a/src/lib/Client/Tools/Chkconfig.py b/src/lib/Client/Tools/Chkconfig.py index 0ef0b46ea..ded4ef16a 100644 --- a/src/lib/Client/Tools/Chkconfig.py +++ b/src/lib/Client/Tools/Chkconfig.py @@ -30,13 +30,17 @@ class Chkconfig(Bcfg2.Client.Tools.SvcTool): except IndexError: onlevels = [] - pstatus = self.cmd.run('/sbin/service %s status' % \ - entry.get('name'))[0] - # chkconfig/init.d service if entry.get('status') == 'on': - status = (len(onlevels) > 0 ) and not pstatus + status = (len(onlevels) > 0 ) else: - status = (len(onlevels) == 0) and pstatus + status = (len(onlevels) == 0) + + if entry.get('supervised', 'false') == 'true': + pstatus, pout = self.cmd.run('/sbin/service %s status' % \ + entry.get('name')) + # chkconfig/init.d service + if entry.get('status') == 'on': + status = status and not pstatus if not status: if entry.get('status') == 'on': -- cgit v1.2.3-1-g7c22