cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Let update-rc.d set changed flag properly

Browse source 
When update-rc.d is used to enable/disable service, the changed flag was
always true (see #2189). This commit fixes that.

Signed-off-by: martin f. krafft <madduck@madduck.net>
This commit is contained in:
martin f. krafft 2013-06-22 11:43:38 +02:00
parent 0ed5d18d60
commit 22b30b9281
1 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
system/service
View file

@ -547,6 +547,24 @@ class LinuxService(Service):
if not self.enable: if not self.enable:
return return
if self.enable_cmd.endswith("update-rc.d"):
action = 'enable' if self.enable else 'disable'
(rc, out, err) = self.execute_command("%s -n %s %s" \
% (self.enable_cmd, self.name, action))
self.changed = False
for line in out.splitlines():
if line.startswith('rename'):
self.changed = True
break
if self.module.check_mode:
self.module.exit_json(changed=changed)
if not self.changed:
return
return self.execute_command("%s %s %s" % (self.enable_cmd, self.name, action))
# we change argument depending on real binary used: # we change argument depending on real binary used:
# - update-rc.d and systemctl wants enable/disable # - update-rc.d and systemctl wants enable/disable
# - chkconfig wants on/off # - chkconfig wants on/off
@ -561,9 +579,7 @@ class LinuxService(Service):
enable_disable = "disable" enable_disable = "disable"
add_delete = "delete" add_delete = "delete"
if self.enable_cmd.endswith("update-rc.d"): if self.enable_cmd.endswith("rc-update"):
args = (self.enable_cmd, self.name, enable_disable)
elif self.enable_cmd.endswith("rc-update"):
args = (self.enable_cmd, add_delete, self.name + " " + self.runlevel) args = (self.enable_cmd, add_delete, self.name + " " + self.runlevel)
elif self.enable_cmd.endswith("systemctl"): elif self.enable_cmd.endswith("systemctl"):
args = (self.enable_cmd, enable_disable, self.name + ".service") args = (self.enable_cmd, enable_disable, self.name + ".service")