diff options
Diffstat (limited to 'windows/ovs-windows-installer')
| -rw-r--r-- | windows/ovs-windows-installer/CustomActions.wxs | 6 | ||||
| -rw-r--r-- | windows/ovs-windows-installer/Product.wxs | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/windows/ovs-windows-installer/CustomActions.wxs b/windows/ovs-windows-installer/CustomActions.wxs index bce945518..422f95169 100644 --- a/windows/ovs-windows-installer/CustomActions.wxs +++ b/windows/ovs-windows-installer/CustomActions.wxs @@ -63,5 +63,11 @@ <CustomAction Id="ChangeOvsVSwitchdService" BinaryKey="OVSActions" JScriptCall="changeServiceAction" Execute="deferred" Return="check" Impersonate="no" /> + <CustomAction Id="AddTriggerToOvsVswitchdService_Prop" Property="AddTriggerToOvsVswitchdService" + Value='"[System64Folder]sc.exe" triggerinfo ovs-vswitchd "start/strcustom/6066F867-7CA1-4418-85FD-36E3F9C0600C/VmmsWmiEventProvider"|0|failed to add triggerinfo to ovs-vswitchd service' + Execute="immediate" /> + <CustomAction Id="AddTriggerToOvsVswitchdService" + BinaryKey="OVSActions" + JScriptCall="runCommandAction" Execute="deferred" Return="check" Impersonate="no" /> </Fragment> </Wix> diff --git a/windows/ovs-windows-installer/Product.wxs b/windows/ovs-windows-installer/Product.wxs index 0cdc9a88a..23bc8805d 100644 --- a/windows/ovs-windows-installer/Product.wxs +++ b/windows/ovs-windows-installer/Product.wxs @@ -83,6 +83,8 @@ <Custom Action="InitializeDB_Prop" After="CostFinalize"><![CDATA[REMOVE <> "ALL" AND (&OpenvSwitchDriver = 3)]]></Custom> <Custom Action="InitializeDB" After="ChangeOvsdbServerService" ><![CDATA[REMOVE <> "ALL" AND (&OpenvSwitchDriver = 3)]]></Custom> + <Custom Action="AddTriggerToOvsVswitchdService_Prop" After="CostFinalize"><![CDATA[NOT Installed AND (&OpenvSwitchDriver = 3)]]></Custom> + <Custom Action="AddTriggerToOvsVswitchdService" Before="ChangeOvsVSwitchdService"><![CDATA[NOT Installed AND (&OpenvSwitchDriver = 3)]]></Custom> <Custom Action="StartOvsVSwitchdService_Prop" After="CostFinalize"><![CDATA[NOT Installed AND (&OpenvSwitchDriver = 3)]]></Custom> <Custom Action="RestartOvsVSwitchdService_Prop" After="CostFinalize"><![CDATA[Installed AND REMOVE <> "ALL" AND (&OpenvSwitchDriver = 3)]]></Custom> <Custom Action="ChangeOvsVSwitchdService" Before="InstallFinalize"><![CDATA[REMOVE <> "ALL" AND (&OpenvSwitchDriver = 3)]]></Custom> @@ -207,7 +209,7 @@ Name="ovs-vswitchd" DisplayName="Open vSwitch Service" Description="Open vSwitch Service" - Start="auto" + Start="demand" Account="LocalSystem" ErrorControl="ignore" Interactive="no"> |