From 7edcd2fc64c94f98bdacbaad99d00cfdef0a5a66 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Mon, 8 Aug 2011 10:38:15 -0400 Subject: do not start/stop services with "-s disabled" --- src/lib/Client/Tools/Chkconfig.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/lib/Client/Tools/Chkconfig.py b/src/lib/Client/Tools/Chkconfig.py index 12d1a3444..f49457363 100644 --- a/src/lib/Client/Tools/Chkconfig.py +++ b/src/lib/Client/Tools/Chkconfig.py @@ -60,9 +60,10 @@ class Chkconfig(Bcfg2.Client.Tools.SvcTool): entry.get('name'))[0] needs_modification = ((command == 'start' and pstatus) or \ (command == 'stop' and not pstatus)) - if not(self.setup.get('dryrun')) and needs_modification: - self.cmd.run('/sbin/service %s %s' % (entry.get('name'), - command)) + if (not self.setup.get('dryrun') and + self.setup['servicemode'] != 'disabled' and + needs_modification: + self.cmd.run(self.get_svc_command(entry, command)) # service was modified, so it failed pstatus = False -- cgit v1.2.3-1-g7c22