From 915cee209673e944c63b6434863a6587b40672d1 Mon Sep 17 00:00:00 2001
From: Alin Gabriel Serdean <aserdean@ovn.org>
Date: Mon, 11 Dec 2017 20:22:27 +0200
Subject: MSI: Use platform specific netcfg location

We use the command `netcfg` to install the Windows datapath.

Since we have both 32 and 64 bit installers available point it to the
platform specific binary.

Found while testing.

Signed-off-by: Alin Gabriel Serdean <aserdean@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
---
 windows/ovs-windows-installer/CustomActions.wxs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/windows/ovs-windows-installer/CustomActions.wxs b/windows/ovs-windows-installer/CustomActions.wxs
index 422f95169..cc1b80eff 100644
--- a/windows/ovs-windows-installer/CustomActions.wxs
+++ b/windows/ovs-windows-installer/CustomActions.wxs
@@ -16,6 +16,11 @@
     under the License.
   </copyright>
 -->
+<?if $(var.Platform) = x64 ?>
+  <?define NetcfgFolder = "[System64Folder]" ?>
+<?else ?>
+  <?define NetcfgFolder = "[WindowsFolder]Sysnative" ?>
+<?endif ?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <Fragment>
     <Binary Id="OVSActions" SourceFile="Actions\OVSActions.js" />
@@ -35,14 +40,14 @@
               JScriptCall="runCommandAction" Execute="deferred" Return="check" Impersonate="no" />
 
     <CustomAction Id="InstallOpenVSwitchDriver_Prop" Property="InstallOpenVSwitchDriver"
-                  Value='"[WindowsFolder]Sysnative\netcfg.exe" -l "[DRIVERDIR]\ovsext.inf" -c s -i ovsext|0|netcfg failed to install the Open vSwitch Hyper-V switch extension'
+                  Value='"$(var.NetcfgFolder)\netcfg.exe" -l "[DRIVERDIR]\ovsext.inf" -c s -i ovsext|0|netcfg failed to install the Open vSwitch Hyper-V switch extension'
                   Execute="immediate" />
     <CustomAction Id="InstallOpenVSwitchDriver"
               BinaryKey="OVSActions"
               JScriptCall="runCommandAction" Execute="deferred" Return="check" Impersonate="no" />
 
     <CustomAction Id="UninstallOpenVSwitchDriver_Prop" Property="UninstallOpenVSwitchDriver"
-                  Value='"[WindowsFolder]Sysnative\netcfg.exe" -u ovsext|0|netcfg failed to uninstall the Open vSwitch Hyper-V switch extension'
+                  Value='"$(var.NetcfgFolder)\netcfg.exe" -u ovsext|0|netcfg failed to uninstall the Open vSwitch Hyper-V switch extension'
                   Execute="immediate" />
     <CustomAction Id="UninstallOpenVSwitchDriver"
               BinaryKey="OVSActions"
-- 
cgit v1.2.1