Skip to content

Commit 22150fd

Browse files
committed
fix: kill dhclient process when interface was dhcp
1 parent ebfed94 commit 22150fd

1 file changed

Lines changed: 9 additions & 0 deletions

File tree

plugins/module_utils/interface.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,9 +220,18 @@ def _copy_and_update_target(self):
220220
if changed:
221221
if self.params['enable']:
222222
self.setup_interface_cmds += "interface_bring_down('{0}', false);\n".format(self.target_elt.tag)
223+
224+
# possibly kill remaining dhclient process
225+
if 'ipaddr' in before and before['ipaddr'] == 'dhcp':
226+
self.setup_interface_cmds += "kill_dhclient_process(get_real_interface({0}));\n".format(self.target_elt.tag)
227+
228+
223229
self.setup_interface_cmds += "interface_configure('{0}', true);\n".format(self.target_elt.tag)
224230
else:
225231
self.setup_interface_cmds += "interface_bring_down('{0}', true);\n".format(self.target_elt.tag)
232+
# possibly kill remaining dhclient process
233+
if 'ipaddr' in before and before['ipaddr'] == 'dhcp':
234+
self.setup_interface_cmds += "kill_dhclient_process(get_real_interface({0}));\n".format(self.target_elt.tag)
226235

227236
return (before, changed)
228237

0 commit comments

Comments
 (0)