diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-03-22 03:29:49 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-03-22 03:29:49 -0400 |
| commit | 9e05dd2d21f3db77607f1e4aa53a4657514a4fce (patch) | |
| tree | 247f8049b34d8d5fb0dc05cd78be8bbb1db91327 /cloudinit/sources/helpers/vmware/imc/config_nic.py | |
| parent | 3a3f960d5cfee60766e7de9e1fced537cac72106 (diff) | |
| parent | 6ce134c1868478345471ba9166f1523f7d9bf19d (diff) | |
| download | vyos-cloud-init-9e05dd2d21f3db77607f1e4aa53a4657514a4fce.tar.gz vyos-cloud-init-9e05dd2d21f3db77607f1e4aa53a4657514a4fce.zip | |
merge from trunk.net1
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): |