From 76166caff42b82aa55c6bcd9528f2c1e3575232a Mon Sep 17 00:00:00 2001
From: xiaofengw-vmware <42736879+xiaofengw-vmware@users.noreply.github.com>
Date: Tue, 12 Oct 2021 11:54:31 +0800
Subject: 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
---
 tools/ds-identify | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'tools')

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
-- 
cgit v1.2.3