Merge pull request #3315 from madduck/fix-service-updatercd-changed
Let update-rc.d set changed flag properly
This commit is contained in:
commit
8d23df3576
1 changed files with 22 additions and 3 deletions
|
@ -547,6 +547,27 @@ class LinuxService(Service):
|
|||
if not self.enable:
|
||||
return
|
||||
|
||||
if self.enable_cmd.endswith("update-rc.d"):
|
||||
if self.enable:
|
||||
action = 'enable'
|
||||
else:
|
||||
action = '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:
|
||||
# - update-rc.d and systemctl wants enable/disable
|
||||
# - chkconfig wants on/off
|
||||
|
@ -561,9 +582,7 @@ class LinuxService(Service):
|
|||
enable_disable = "disable"
|
||||
add_delete = "delete"
|
||||
|
||||
if self.enable_cmd.endswith("update-rc.d"):
|
||||
args = (self.enable_cmd, self.name, enable_disable)
|
||||
elif self.enable_cmd.endswith("rc-update"):
|
||||
if self.enable_cmd.endswith("rc-update"):
|
||||
args = (self.enable_cmd, add_delete, self.name + " " + self.runlevel)
|
||||
elif self.enable_cmd.endswith("systemctl"):
|
||||
args = (self.enable_cmd, enable_disable, self.name + ".service")
|
||||
|
|
Loading…
Reference in a new issue