From 841b9201412aaf00d0c74a60ec21544e5c2c6c10 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Wed, 16 Jun 2010 13:50:30 +0000 Subject: Upstart: Fix bug when installing services Signed-off-by: Sol Jerome git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5938 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Client/Tools/Upstart.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/lib/Client/Tools/Upstart.py b/src/lib/Client/Tools/Upstart.py index 12d82488d..113f28d23 100644 --- a/src/lib/Client/Tools/Upstart.py +++ b/src/lib/Client/Tools/Upstart.py @@ -59,12 +59,12 @@ class Upstart(Bcfg2.Client.Tools.SvcTool): def InstallService(self, entry): """Install Service for entry.""" - if entry.get('mode', 'default') == 'supervised': - pstatus, pout = self.cmd.run('/usr/sbin/service %s status' % \ - entry.get('name')) - if pstatus: - self.cmd.run('/usr/sbin/service %s start' % (entry.get('name'))) - return True + if entry.get('status') == 'on': + pstatus = self.cmd.run(self.get_svc_command(entry, 'start'))[0] + elif entry.get('status') == 'off': + pstatus = self.cmd.run(self.get_svc_command(entry, 'stop'))[0] + # pstatus is true if command failed + return not pstatus def FindExtra(self): """Locate extra Upstart services.""" -- cgit v1.2.3-1-g7c22