diff options
| author | xiaofengw-vmware <42736879+xiaofengw-vmware@users.noreply.github.com> | 2021-10-12 11:54:31 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-11 22:54:31 -0500 |
| commit | 76166caff42b82aa55c6bcd9528f2c1e3575232a (patch) | |
| tree | df1b497b9bc2caa4e6a0ce0022be289f502d9909 /tools | |
| parent | ca0da042e73d1cf078435befa02a6e09d004b62d (diff) | |
| download | vyos-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 'tools')
| -rwxr-xr-x | tools/ds-identify | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/ds-identify b/tools/ds-identify index 63d2f0c8..c2f710e9 100755 --- a/tools/ds-identify +++ b/tools/ds-identify @@ -899,11 +899,16 @@ ovf_vmware_guest_customization() { # we have to have the plugin to do vmware customization local found="" pkg="" pre="${PATH_ROOT}/usr/lib" + local x86="x86_64-linux-gnu" aarch="aarch64-linux-gnu" local ppath="plugins/vmsvc/libdeployPkgPlugin.so" for pkg in vmware-tools open-vm-tools; do if [ -f "$pre/$pkg/$ppath" -o -f "${pre}64/$pkg/$ppath" ]; then found="$pkg"; break; fi + # search in multiarch dir + if [ -f "$pre/$x86/$pkg/$ppath" -o -f "$pre/$aarch/$pkg/$ppath" ]; then + found="$pkg"; break; + fi done [ -n "$found" ] || return 1 # vmware customization is disabled by default |