diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-06-27 10:35:22 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-06-27 10:42:24 -0400 |
| commit | 9f85b41f12bdc5f25d64b91a6c0413949c9c730e (patch) | |
| tree | 89621a8edb804c32dbd54edec372686211c61458 /src/lib/Bcfg2/Client/Tools/Chkconfig.py | |
| parent | 3261f7cf5314a76b85884942d077146fe8f8fc24 (diff) | |
| download | bcfg2-9f85b41f12bdc5f25d64b91a6c0413949c9c730e.tar.gz bcfg2-9f85b41f12bdc5f25d64b91a6c0413949c9c730e.tar.bz2 bcfg2-9f85b41f12bdc5f25d64b91a6c0413949c9c730e.zip | |
Options: migrated client drivers to new parser
Diffstat (limited to 'src/lib/Bcfg2/Client/Tools/Chkconfig.py')
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/Chkconfig.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/Chkconfig.py b/src/lib/Bcfg2/Client/Tools/Chkconfig.py index 156f76159..0d2269a3f 100644 --- a/src/lib/Bcfg2/Client/Tools/Chkconfig.py +++ b/src/lib/Bcfg2/Client/Tools/Chkconfig.py @@ -3,7 +3,6 @@ """This is chkconfig support.""" import os - import Bcfg2.Client.Tools import Bcfg2.Client.XML @@ -96,15 +95,15 @@ class Chkconfig(Bcfg2.Client.Tools.SvcTool): bootcmd = '/sbin/chkconfig %s %s' % (entry.get('name'), entry.get('bootstatus')) bootcmdrv = self.cmd.run(bootcmd).success - if self.setup['servicemode'] == 'disabled': + if Bcfg2.Options.setup.servicemode == 'disabled': # 'disabled' means we don't attempt to modify running svcs return bootcmdrv - buildmode = self.setup['servicemode'] == 'build' - if (entry.get('status') == 'on' and not buildmode) and \ - entry.get('current_status') == 'off': + buildmode = Bcfg2.Options.setup.servicemode == 'build' + if ((entry.get('status') == 'on' and not buildmode) and + entry.get('current_status') == 'off'): svccmdrv = self.start_service(entry) - elif (entry.get('status') == 'off' or buildmode) and \ - entry.get('current_status') == 'on': + elif ((entry.get('status') == 'off' or buildmode) and + entry.get('current_status') == 'on'): svccmdrv = self.stop_service(entry) else: svccmdrv = True # ignore status attribute |