diff options
author | Sol Jerome <sol.jerome@gmail.com> | 2016-03-03 10:51:47 -0600 |
---|---|---|
committer | Sol Jerome <sol.jerome@gmail.com> | 2016-03-03 10:51:47 -0600 |
commit | f9c60b4c04086a3f653eaa0b5be9d5398a7f27ae (patch) | |
tree | 019ec552cf736d58dc57fa8c49ac1407901cbb53 /src/lib/Bcfg2/Client/Tools | |
parent | bedd3b529007515b57d4f08c14ba3178052595b2 (diff) | |
parent | 498fee62c01a5187354b109c5378ecf944bf9f94 (diff) | |
download | bcfg2-f9c60b4c04086a3f653eaa0b5be9d5398a7f27ae.tar.gz bcfg2-f9c60b4c04086a3f653eaa0b5be9d5398a7f27ae.tar.bz2 bcfg2-f9c60b4c04086a3f653eaa0b5be9d5398a7f27ae.zip |
Merge branch 'setup-options' of https://github.com/gordonmessmer/bcfg2
Diffstat (limited to 'src/lib/Bcfg2/Client/Tools')
-rw-r--r-- | src/lib/Bcfg2/Client/Tools/Chkconfig.py | 4 | ||||
-rw-r--r-- | src/lib/Bcfg2/Client/Tools/Systemd.py | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/Chkconfig.py b/src/lib/Bcfg2/Client/Tools/Chkconfig.py index fab142a7c..b535de191 100644 --- a/src/lib/Bcfg2/Client/Tools/Chkconfig.py +++ b/src/lib/Bcfg2/Client/Tools/Chkconfig.py @@ -95,10 +95,10 @@ class Chkconfig(Bcfg2.Client.Tools.SvcTool): bootcmd = '/sbin/chkconfig %s %s' % (entry.get('name'), bootstatus) bootcmdrv = self.cmd.run(bootcmd).success - if Bcfg2.Options.setup.servicemode == 'disabled': + if Bcfg2.Options.setup.service_mode == 'disabled': # 'disabled' means we don't attempt to modify running svcs return bootcmdrv - buildmode = Bcfg2.Options.setup.servicemode == 'build' + buildmode = Bcfg2.Options.setup.service_mode == 'build' if ((entry.get('status') == 'on' and not buildmode) and entry.get('current_status') == 'off'): svccmdrv = self.start_service(entry) diff --git a/src/lib/Bcfg2/Client/Tools/Systemd.py b/src/lib/Bcfg2/Client/Tools/Systemd.py index 5f9208afc..8919e777b 100644 --- a/src/lib/Bcfg2/Client/Tools/Systemd.py +++ b/src/lib/Bcfg2/Client/Tools/Systemd.py @@ -74,12 +74,12 @@ class Systemd(Bcfg2.Client.Tools.SvcTool): # Return failure immediately and do not start/stop the service. return False - # Start or stop the service, depending on the current servicemode + # Start or stop the service, depending on the current service_mode cmd = None - if Bcfg2.Options.setup.servicemode == 'disabled': + if Bcfg2.Options.setup.service_mode == 'disabled': # 'disabled' means we don't attempt to modify running svcs pass - elif Bcfg2.Options.setup.servicemode == 'build': + elif Bcfg2.Options.setup.service_mode == 'build': # 'build' means we attempt to stop all services started if entry.get('current_status') == 'on': cmd = self.get_svc_command(entry, 'stop') |