From f26272a492b533ddad65f1fd4bbe8ca4c46b8bba Mon Sep 17 00:00:00 2001 From: uwila Date: Tue, 17 Jul 2018 03:33:01 +0200 Subject: [PATCH] Fix 2 issues in sysvinit module (#42786) * Do not compare result to unset parameter in sysvinit module * Fix misformed command in sysvinit module * Small None-comparison style fix in sysvinit module --- lib/ansible/modules/system/sysvinit.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/ansible/modules/system/sysvinit.py b/lib/ansible/modules/system/sysvinit.py index 6cefb5aebb..82724c1c33 100644 --- a/lib/ansible/modules/system/sysvinit.py +++ b/lib/ansible/modules/system/sysvinit.py @@ -258,7 +258,7 @@ def main(): elif location.get('chkconfig'): (rc, out, err) = module.run_command("%s --level %s %s off" % (location['chkconfig'], ''.join(runlevels), name)) else: - if enabled != runlevel_status["enabled"]: + if enabled is not None and enabled != runlevel_status["enabled"]: result['changed'] = True result['status']['enabled']['changed'] = True @@ -299,7 +299,9 @@ def main(): def runme(doit): - cmd = "%s %s %s %s" % (script, doit, name, module.params['arguments']) + args = module.params['arguments'] + cmd = "%s %s %s" % (script, doit, "" if args is None else args) + # how to run if module.params['daemonize']: (rc, out, err) = daemonize(cmd)