summaryrefslogtreecommitdiff
path: root/cloudinit/sources
diff options
context:
space:
mode:
authorxiaofengw-vmware <42736879+xiaofengw-vmware@users.noreply.github.com>2021-10-12 11:54:31 +0800
committerGitHub <noreply@github.com>2021-10-11 22:54:31 -0500
commit76166caff42b82aa55c6bcd9528f2c1e3575232a (patch)
treedf1b497b9bc2caa4e6a0ce0022be289f502d9909 /cloudinit/sources
parentca0da042e73d1cf078435befa02a6e09d004b62d (diff)
downloadvyos-cloud-init-76166caff42b82aa55c6bcd9528f2c1e3575232a.tar.gz
vyos-cloud-init-76166caff42b82aa55c6bcd9528f2c1e3575232a.zip
VMWARE: search the deployPkg plugin in multiarch dir (#1061)
Due to multiarch, the libdeployPkgPlugin.so is deployed into dir /usr/lib/<multiarch name>/open-vm-tools, we need to add this path into search_paths. LP: #1944946
Diffstat (limited to 'cloudinit/sources')
-rw-r--r--cloudinit/sources/DataSourceOVF.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/cloudinit/sources/DataSourceOVF.py b/cloudinit/sources/DataSourceOVF.py
index 3e436dfa..08a205f1 100644
--- a/cloudinit/sources/DataSourceOVF.py
+++ b/cloudinit/sources/DataSourceOVF.py
@@ -115,7 +115,9 @@ class DataSourceOVF(sources.DataSource):
else:
search_paths = (
"/usr/lib/vmware-tools", "/usr/lib64/vmware-tools",
- "/usr/lib/open-vm-tools", "/usr/lib64/open-vm-tools")
+ "/usr/lib/open-vm-tools", "/usr/lib64/open-vm-tools",
+ "/usr/lib/x86_64-linux-gnu/open-vm-tools",
+ "/usr/lib/aarch64-linux-gnu/open-vm-tools")
plugin = "libdeployPkgPlugin.so"
deployPkgPluginPath = None