diff options
author | Wesley Wiedenmeier <wesley.wiedenmeier@gmail.com> | 2016-03-18 01:38:27 -0500 |
---|---|---|
committer | Wesley Wiedenmeier <wesley.wiedenmeier@gmail.com> | 2016-03-18 01:38:27 -0500 |
commit | 671493a26966b179ecc09ce222b987fbc5376fe2 (patch) | |
tree | 9e1fe1dd8b4b147268d716b09cfca22a3bdd7df3 /cloudinit/sources/helpers/vmware/imc/config_nic.py | |
parent | 16a44056eaa5cc36fd9f6b08fe3a6bb4700fe1e7 (diff) | |
parent | 56402e91e95960f54a39eb18cbda391f00f95b6e (diff) | |
download | vyos-cloud-init-671493a26966b179ecc09ce222b987fbc5376fe2.tar.gz vyos-cloud-init-671493a26966b179ecc09ce222b987fbc5376fe2.zip |
Merge from trunk
Diffstat (limited to 'cloudinit/sources/helpers/vmware/imc/config_nic.py')
-rw-r--r-- | cloudinit/sources/helpers/vmware/imc/config_nic.py | 3 |
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): |