summaryrefslogtreecommitdiff
path: root/cloudinit/sources/helpers/vmware/imc/config_nic.py
diff options
context:
space:
mode:
authorScott Moser <smoser@brickies.net>2016-08-23 16:48:40 -0400
committerScott Moser <smoser@brickies.net>2016-08-23 16:48:40 -0400
commit24365490c58df8f0ef2246838c81ec604f0311ac (patch)
tree3a6e44277256d15bb215cef3c61799397a673e6e /cloudinit/sources/helpers/vmware/imc/config_nic.py
parentf16b906c987c7a7948c9adad8f32c1f786ca6569 (diff)
parent18bf614ca1d9fbabdf83495e7675a2cacaf6c2f4 (diff)
downloadvyos-cloud-init-24365490c58df8f0ef2246838c81ec604f0311ac.tar.gz
vyos-cloud-init-24365490c58df8f0ef2246838c81ec604f0311ac.zip
merge trunk at 0.7.7~bzr1189
Diffstat (limited to 'cloudinit/sources/helpers/vmware/imc/config_nic.py')
-rw-r--r--cloudinit/sources/helpers/vmware/imc/config_nic.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/cloudinit/sources/helpers/vmware/imc/config_nic.py b/cloudinit/sources/helpers/vmware/imc/config_nic.py
index 8c5c08cf..77098a05 100644
--- a/cloudinit/sources/helpers/vmware/imc/config_nic.py
+++ b/cloudinit/sources/helpers/vmware/imc/config_nic.py
@@ -205,7 +205,8 @@ class NicConfigurator:
def clear_dhcp(self):
logger.info('Clearing DHCP leases')
- util.subp(["pkill", "dhclient"])
+ # Ignore the return code 1.
+ util.subp(["pkill", "dhclient"], rcs=[0, 1])
util.subp(["rm", "-f", "/var/lib/dhcp/*"])
def if_down_up(self):