Skip to content

Commit

Permalink
MSI: Use platform specific netcfg location
Browse files Browse the repository at this point in the history
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 <[email protected]>
Acked-by: Ben Pfaff <[email protected]>
  • Loading branch information
aserdean committed Jan 5, 2018
1 parent 14f602b commit 915cee2
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions windows/ovs-windows-installer/CustomActions.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand All @@ -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"
Expand Down

0 comments on commit 915cee2

Please sign in to comment.