diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-06-05 17:34:29 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-06-05 17:34:34 -0400 |
| commit | 42e619c585de45e5e4e16ae3746efb7db9f90b1e (patch) | |
| tree | dfdf1905a4bf586bba321d6ab562343cf1ebc28a /src/lib/Bcfg2/Client/Tools/Systemd.py | |
| parent | c6e7bfed9b6563b0c567997f063a8259ec548519 (diff) | |
| download | bcfg2-42e619c585de45e5e4e16ae3746efb7db9f90b1e.tar.gz bcfg2-42e619c585de45e5e4e16ae3746efb7db9f90b1e.tar.bz2 bcfg2-42e619c585de45e5e4e16ae3746efb7db9f90b1e.zip | |
re-rationalized service modes to make them more consistent and granular
Diffstat (limited to 'src/lib/Bcfg2/Client/Tools/Systemd.py')
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/Systemd.py | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/Systemd.py b/src/lib/Bcfg2/Client/Tools/Systemd.py index e3f6a4169..a295bc608 100644 --- a/src/lib/Bcfg2/Client/Tools/Systemd.py +++ b/src/lib/Bcfg2/Client/Tools/Systemd.py @@ -42,18 +42,11 @@ class Systemd(Bcfg2.Client.Tools.SvcTool): def InstallService(self, entry): """Install Service entry.""" - # don't take any actions for mode = 'manual' - if entry.get('mode', 'default') == 'manual': - self.logger.info("Service %s mode set to manual. Skipping " - "installation." % (entry.get('name'))) - return True - if entry.get('status') == 'on': - pstatus = self.cmd.run(self.get_svc_command(entry, 'enable'))[0] - pstatus = self.cmd.run(self.get_svc_command(entry, 'start'))[0] - + rv = self.cmd.run(self.get_svc_command(entry, 'enable'))[0] == 0 + rv &= self.cmd.run(self.get_svc_command(entry, 'start'))[0] == 0 else: - pstatus = self.cmd.run(self.get_svc_command(entry, 'stop'))[0] - pstatus = self.cmd.run(self.get_svc_command(entry, 'disable'))[0] + rv = self.cmd.run(self.get_svc_command(entry, 'stop'))[0] == 0 + rv &= self.cmd.run(self.get_svc_command(entry, 'disable'))[0] == 0 - return not pstatus + return rv |