diff options
| author | Gordon Messmer <gordon@dragonsdawn.net> | 2016-02-17 14:19:13 -0800 |
|---|---|---|
| committer | Gordon Messmer <gordon@dragonsdawn.net> | 2016-02-17 14:19:13 -0800 |
| commit | 2ea87b18e78f081b48bfdec0a1d40c464e91148f (patch) | |
| tree | ad1f8b190cfd9cd1d491019f2bf5385873573543 /src/lib/Bcfg2 | |
| parent | c8c0d7f0dbfcf315f3c1c3d85915fd0a16092b31 (diff) | |
| download | bcfg2-2ea87b18e78f081b48bfdec0a1d40c464e91148f.tar.gz bcfg2-2ea87b18e78f081b48bfdec0a1d40c464e91148f.tar.bz2 bcfg2-2ea87b18e78f081b48bfdec0a1d40c464e91148f.zip | |
Correct the name of the service_mode option.
Diffstat (limited to 'src/lib/Bcfg2')
| -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 bfcc69475..c3d4fc509 100644 --- a/src/lib/Bcfg2/Client/Tools/Systemd.py +++ b/src/lib/Bcfg2/Client/Tools/Systemd.py @@ -72,12 +72,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') |