diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2013-05-06 19:25:19 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2013-05-06 19:25:19 -0500 |
| commit | 575d64c8232449b7ea8a1a6e6b2d25816cbf7ff1 (patch) | |
| tree | 28a9be143a27fddd13cd25580b9b72ddf689bae7 /src | |
| parent | 9a1fe832f52b68c4e61546171195cb53e4ff2585 (diff) | |
| parent | f9fd18bd1089f7edd7ca6048e000c45375250eaa (diff) | |
| download | bcfg2-575d64c8232449b7ea8a1a6e6b2d25816cbf7ff1.tar.gz bcfg2-575d64c8232449b7ea8a1a6e6b2d25816cbf7ff1.tar.bz2 bcfg2-575d64c8232449b7ea8a1a6e6b2d25816cbf7ff1.zip | |
Merge branch 'chkconfig-respect-servicemode' of https://github.com/fennm/bcfg2 into maint
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/Chkconfig.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/Chkconfig.py b/src/lib/Bcfg2/Client/Tools/Chkconfig.py index ec7f462b3..b1f0b6fa1 100644 --- a/src/lib/Bcfg2/Client/Tools/Chkconfig.py +++ b/src/lib/Bcfg2/Client/Tools/Chkconfig.py @@ -65,16 +65,18 @@ class Chkconfig(Bcfg2.Client.Tools.SvcTool): self.cmd.run("/sbin/chkconfig --add %s" % (entry.attrib['name'])) self.logger.info("Installing Service %s" % (entry.get('name'))) rv = True - if entry.get('status') == 'off': + if entry.get('status') == 'off' or self.setup["servicemode"] == "build": rv &= self.cmd.run((rcmd + " --level 0123456") % (entry.get('name'), entry.get('status'))).success - if entry.get("current_status") == "on": + if entry.get("current_status") == "on" and \ + self.setup["servicemode"] != "disabled": rv &= self.stop_service(entry).success else: rv &= self.cmd.run(rcmd % (entry.get('name'), entry.get('status'))).success - if entry.get("current_status") == "off": + if entry.get("current_status") == "off" and \ + self.setup["servicemode"] != "disabled": rv &= self.start_service(entry).success return rv |