summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorYun Zheng Hu <yunzheng.hu@gmail.com>2021-07-15 01:16:01 +0200
committerYun Zheng Hu <hu@fox-it.com>2021-07-23 22:59:24 +0200
commit96acb4f233cab5d7e7e7fabc8789819ffd8af5a4 (patch)
treec912e5ded61c54c087bb5a4a8d3122031c5f7336 /src
parent7292631373ea50f9908796ef2eda32e672d1df2e (diff)
downloadvyos-1x-96acb4f233cab5d7e7e7fabc8789819ffd8af5a4.tar.gz
vyos-1x-96acb4f233cab5d7e7e7fabc8789819ffd8af5a4.zip
vyos-1x-vmware: T3682: remove dhclient from ether-resume.py
dhclient is already handled by netplug so it's removed to avoid double renewing of dhcp leases.
Diffstat (limited to 'src')
-rwxr-xr-xsrc/etc/vmware-tools/scripts/resume-vm-default.d/ether-resume.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/etc/vmware-tools/scripts/resume-vm-default.d/ether-resume.py b/src/etc/vmware-tools/scripts/resume-vm-default.d/ether-resume.py
index ec33906ba..4e7fb117c 100755
--- a/src/etc/vmware-tools/scripts/resume-vm-default.d/ether-resume.py
+++ b/src/etc/vmware-tools/scripts/resume-vm-default.d/ether-resume.py
@@ -25,9 +25,8 @@ def get_config():
c = Config()
interfaces = dict()
for intf in c.list_effective_nodes('interfaces ethernet'):
- # skip interfaces that are disabled or is configured for dhcp
+ # skip interfaces that are disabled
check_disable = f'interfaces ethernet {intf} disable'
- check_dhcp = f'interfaces ethernet {intf} address dhcp'
if c.exists_effective(check_disable):
continue
@@ -49,10 +48,10 @@ def apply(config):
# add configured addresses to interface
for addr in addresses:
- if addr == 'dhcp':
- cmd = ['dhclient', intf]
- else:
- cmd = f'ip address add {addr} dev {intf}'
+ # dhcp is handled by netplug
+ if addr in ['dhcp', 'dhcpv6']:
+ continue
+ cmd = f'ip address add {addr} dev {intf}'
syslog.syslog(cmd)
run(cmd)