[WinOF] When requested, start the local OpenSM service immediately after loading...

Removed some unused code in CustomActions.vbs

git-svn-id: svn://openib.tc.cornell.edu/gen1@1811 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/trunk/WinOF/WIX/CustomActions.vbs b/trunk/WinOF/WIX/CustomActions.vbs
index c41283cac3d32e02bac6bc06f649adfa4476579c..f882bcd1a422b10d1a263559be7c21ad15a69f25 100644 (file)
--- a/trunk/WinOF/WIX/CustomActions.vbs
+++ b/trunk/WinOF/WIX/CustomActions.vbs
@@ -884,7 +884,7 @@ Const ERROR_SUCCESS_REBOOT_REQUIRED = 3010 ' restart required
 Const DPINST_ERR = &H80000000\r
 \r
 \r
-Function dpinst_install(WshShell,sInstalldir,need_IPOIB,need_VNIC,need_SRP)\r
+Function dpinst_install(WshShell,sInstalldir,localSM,IPOIB,VNIC,SRP)\r
 \r
        Dim dpinst,dpinstNET,cmd,rc\r
 \r
@@ -911,7 +911,7 @@ Function dpinst_install(WshShell,sInstalldir,need_IPOIB,need_VNIC,need_SRP)
        End if\r
 \r
     ' Check/install IPoIB driver\r
-       If need_IPOIB Then\r
+       If IPOIB Then\r
                cmd = dpinstNET & "/S /F /SA /PATH """ & sInstalldir & "net""" & _\r
                                " /SE /SW"\r
                rc = WshShell.Run (cmd,0,true)\r
@@ -922,14 +922,19 @@ Function dpinst_install(WshShell,sInstalldir,need_IPOIB,need_VNIC,need_SRP)
                End if\r
     End If\r
     \r
+       ' Start the Local OpenSM Subnet Manager service?\r
+       If localSM Then\r
+               OpenSM_StartMeUp WshShell,sInstalldir\r
+       End If\r
+\r
        ' IOU driver is installed (loaded into driver store) by default as the\r
        ' driver (ibiou.sys) is located in IBcore; side-effect of dpinst.exe.\r
 \r
-       If need_VNIC Then\r
+       If VNIC Then\r
                rc = dpinst_Install_VNIC(WshShell,sInstalldir)\r
     End If\r
     \r
-       If need_SRP Then\r
+       If SRP Then\r
                rc = dpinst_Install_SRP(WshShell,sInstalldir)\r
     End If\r
     \r
@@ -938,7 +943,7 @@ Function dpinst_install(WshShell,sInstalldir,need_IPOIB,need_VNIC,need_SRP)
 End Function\r
 \r
 \r
-Function devman_install(WshShell,Installdir,have_mthca,have_mlx4,IPOIB,VNIC,SRP)\r
+Function devman_install(WshShell,Installdir,have_mthca,have_mlx4,localSM,IPOIB,VNIC,SRP)\r
 \r
        Dim devman,cmd,Return,rc\r
 \r
@@ -1058,6 +1063,11 @@ Function devman_install(WshShell,Installdir,have_mthca,have_mlx4,IPOIB,VNIC,SRP)
         Exit Function\r
     End if\r
 \r
+       ' Start a Local OpenSM Subnet Manager service?\r
+       If localSM Then\r
+               OpenSM_StartMeUp WshShell,sInstalldir\r
+       End If\r
+\r
     ' Check/install IPoIB driver\r
        If IPOIB Then\r
        devmanNET = "cmd.exe /c cd /d " & Installdir & _\r
@@ -1120,7 +1130,7 @@ Function DriverInstall()
        Dim devman, devmanEXE\r
     Dim rc, cmd, CheckMode, sInstalldir, fso\r
        Dim DrvInstalled, idev, mlxdev, dev, dev_list\r
-       Dim WLH,need_IPOIB,need_SRP,need_VNIC\r
+       Dim WLH,IPOIB,SRP,VNIC,localSM\r
 \r
        On Error Resume Next\r
 \r
@@ -1192,12 +1202,13 @@ Function DriverInstall()
 \r
        have_mlx4       = instr(InstallThis,"hca_connectX")\r
        have_mthca      = instr(InstallThis,"hca_mthca")\r
-       need_IPOIB      = instr(InstallThis,"fIPoIB")\r
+       IPOIB   = instr(InstallThis,"fIPoIB")\r
 \r
-       need_SRP        = instr(InstallThis,"fSRP") _\r
+       localSM = instr(InstallThis,"fOSMS")\r
+       SRP             = instr(InstallThis,"fSRP") _\r
                                        AND fso.FileExists(sInstalldir & "SRP\ib_srp.inf")\r
 \r
-       need_VNIC       = instr(InstallThis,"fVNIC") _\r
+       VNIC    = instr(InstallThis,"fVNIC") _\r
                                        AND fso.FileExists(sInstalldir & "qlgcvnic\netvnic.inf")\r
 \r
        ' Flag Windows LongHorn Install (aka Vista | Server 2008)\r
@@ -1213,11 +1224,11 @@ Function DriverInstall()
        ' otherwise use devman.\r
 \r
        If WLH Then\r
-           DriverInstall = dpinst_install(WshShell,sInstalldir,need_IPOIB,_\r
-                                                                               need_VNIC,need_SRP)\r
+           DriverInstall = dpinst_install(WshShell,sInstalldir,localSM,IPOIB,_\r
+                                                                               VNIC,SRP)\r
        Else\r
            DriverInstall = devman_install(WshShell,sInstalldir,have_mthca,_\r
-                                                                               have_mlx4,need_IPOIB,need_VNIC,need_SRP)\r
+                                                                               have_mlx4,localSM,IPOIB,VNIC,SRP)\r
        End If\r
 \r
 End Function\r
@@ -1503,18 +1514,15 @@ Sub remove_all_HCA_devices(WshShell,sInstalldir)
 \r
 End Sub\r
 \r
-Function Uninstall_IB_Devices(sInstalldir,VersionNT,sRemove)\r
+Function Uninstall_IB_Devices(WshShell,fso,sInstalldir,VersionNT,sRemove)\r
 \r
-       Dim WshShell, fso, devices, cmd, dpinst, devman, devmanRMAT, tool\r
+       Dim devices, cmd, dpinst, devman, devmanRMAT, tool\r
 \r
        devman = "cmd.exe /c cd /d " & sInstalldir & "IBcore & devman.exe "\r
 \r
        devmanRMAT = devman & "remove @"\r
        devmanDAAT = devman & "disable @"\r
 \r
-       Set WshShell = CreateObject("WScript.Shell")\r
-       Set fso = CreateObject("Scripting.FileSystemObject")\r
-\r
        If (fso.FileExists(sInstalldir & "IBcore\dpinst.exe") = False) Then\r
            Exit Function ' no reason to continue without the tool.\r
        End if\r
@@ -1617,7 +1625,7 @@ Sub DriverUninstall()
        Return = WshShell.Run ("cmd.exe /c sc.exe delete opensm", 0, true)\r
        If Err Then ShowError\r
 \r
-       Uninstall_IB_Devices sInstalldir,sVersionNT,sRemove\r
+       Uninstall_IB_Devices WshShell,fso,sInstalldir,sVersionNT,sRemove\r
 \r
        ' Remove Service entries from the registry\r
 \r
@@ -1773,53 +1781,19 @@ Function ShowErr2(msg)
 End Function\r
 \r
 \r
-' Wix installer now handles this, no longer used although left as example.\r
-' Create OpenSM (Subnet Management) windows service disabled.\r
+' Convert the disabled OpenSM Windows service to an 'auto' startup on next boot.\r
+' OpenSM service was created by WIX installer directives - see WOF.wxs file.\r
+' Performs local service conversion and then starts the local OpenSM service.\r
+' Routine called from DriverInstall phase 'IF' a local OpenSM service was\r
+' requested. The point is to get a local OpenSM up and running prior to loading\r
+' the IOU and SRP/VNIC drivers. Server 2003 IOU driver load fails if OpenSM\r
+' has not yet registered the IOC?\r
 \r
-Sub OpenSM_Install\r
-    Dim sInstalldir,opensmPath,WshShell,fso,sc\r
+Sub OpenSM_StartMeUp(WshShell,sInstalldir)\r
+    Dim  opensmPath\r
 \r
-    sInstalldir = Session.Property("INSTALLDIR")\r
     opensmPath = sInstalldir & "opensm.exe"\r
 \r
-    Set fso = CreateObject("Scripting.FileSystemObject")\r
-    Set WshShell = CreateObject("WScript.Shell")\r
-    \r
-    ' opensm.exe is required\r
-    If Not fso.FileExists(opensmPath) Then\r
-        Exit Sub\r
-    End if\r
-\r
-    sc = "sc.exe create opensm binPath= """ &opensmPath _\r
-               & " -e --service"" DisplayName= ""InfiniBand Subnet Manager"" "\r
-\r
-    ' Install OpeSM as a 'disabled' Service\r
-    sc = sc & "start= disabled"\r
-    Return = WshShell.Run ("cmd.exe /c " & sc, 0, true)\r
-    sc = "sc.exe description opensm ""Configures and manage the InfiniBand Subnet"" "\r
-    Return = WshShell.Run ("cmd.exe /c " & sc, 0, true)\r
-    err.clear\r
-\r
-End Sub\r
-\r
-\r
-' CustomAction called by Wix installer to convert disabled OpenSM service to\r
-' to an 'auto' startup at boot. Performs conversion and then starts service.\r
-\r
-Sub OpenSM_StartMeUp\r
-    Dim sInstalldir, opensmPath, WshShell, fso\r
-\r
-    sInstalldir = Session.Property("INSTALLDIR")\r
-    opensmPath = sInstalldir & "opensm.exe"\r
-\r
-    Set fso = CreateObject("Scripting.FileSystemObject")\r
-    Set WshShell = CreateObject("WScript.Shell")\r
-    \r
-    ' opensm.exe is required\r
-    If Not fso.FileExists(opensmPath) Then\r
-        Exit Sub\r
-    End if\r
-\r
     Return = WshShell.Run ("cmd.exe /c sc.exe config opensm start= auto",0,true)\r
     Return = WshShell.Run ("cmd.exe /c sc.exe start opensm", 0, true)\r
     Err.clear\r
@@ -1827,35 +1801,6 @@ Sub OpenSM_StartMeUp
 End Sub\r
 \r
 \r
-' NOT USED - WIX now handles this\r
-' If not present, then create %SystemDrive%\DAT\dat.conf\r
-\r
-Function DAPL_setup()\r
-      Dim sSysDrive, SrcFile, DstFile, WshShell, fso\r
-\r
-      Set WshShell = CreateObject("WScript.Shell")\r
-      Set fso = CreateObject("Scripting.FileSystemObject")\r
-\r
-      DAPL_setup = 0\r
-      Err.clear\r
-\r
-      SrcFile = Session.Property("INSTALLDIR") & "dat.conf"\r
-\r
-      If fso.FileExists(SrcFile) Then\r
-             On Error Resume Next \r
-          sSysDrive = Session.Property("WindowsVolume")\r
-          ' sSysDrive = WshShell.ExpandEnvironmentStrings("%SystemDrive%") \r
-          ' WindowsVolume includes root \, where %SystemDrive% does not.\r
-          DstFile = sSysDrive & "DAT\dat.conf"\r
-          If fso.FileExists(DstFile) Then\r
-              ' Preserve existing %SystemDrive%\DAT\dat.conf\r
-              Exit Function\r
-          End if\r
-          fso.CopyFile SrcFile, DstFile\r
-      End if\r
-End Function\r
-\r
-\r
 Sub ScheduleLocalReboot\r
                \r
     Set objWMILocator = CreateObject ("WbemScripting.SWbemLocator") \r

diff --git a/trunk/WinOF/WIX/wlh/ia64/wof.wxs b/trunk/WinOF/WIX/wlh/ia64/wof.wxs
index 3d9e747cb1471f7c7958f304c5c70801a90a5fe6..c576ecd1d9a2229885c62c502dfd83b4c9cb25c4 100644 (file)
--- a/trunk/WinOF/WIX/wlh/ia64/wof.wxs
+++ b/trunk/WinOF/WIX/wlh/ia64/wof.wxs
@@ -1495,6 +1495,14 @@
         <Condition Level="201"> IPOIB_EXISTS </Condition> \r
     </Feature>\r
 -->\r
+\r
+    <Feature Id="fOSMS" Title="OpenSM Service Started" Level="5"\r
+         Description="Open Subnet Management started as a local Windows Service"\r
+         Display="expand" ConfigurableDirectory="INSTALLDIR"\r
+         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
+      <ComponentRef Id="OpenSM_Service_enabled" />\r
+    </Feature>\r
+\r
     <Feature Id="fDAPL" Title="DAPL" Description="DAT/DAPL over InfiniBand"\r
          Display="collapse" Level="1" ConfigurableDirectory="INSTALLDIR"\r
          AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
@@ -1556,13 +1564,6 @@
       <ComponentRef Id="cSRP_driver_installed" />\r
     </Feature>\r
 \r
-    <Feature Id="fOSMS" Title="OpenSM Service Started" Level="5"\r
-         Description="Open Subnet Management started as a Windows Service"\r
-         Display="expand" ConfigurableDirectory="INSTALLDIR"\r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-      <ComponentRef Id="OpenSM_Service_enabled" />\r
-    </Feature>\r
-\r
     <Feature Id="fIBsdk" Title="InfiniBand SDK" Level="2"\r
          Description="InfiniBand Software Development Kit (Headers + Libs)"\r
          Display="expand" ConfigurableDirectory="INSTALLDIR"\r
@@ -1601,9 +1602,6 @@
     <CustomAction Id='WSDStart' BinaryKey='CA'\r
          VBScriptCall='WSDEnable' Return='check' />\r
 \r
-    <CustomAction Id="OpenSM_start" BinaryKey="CA"\r
-         VBScriptCall="OpenSM_StartMeUp" Return="check" />\r
-\r
     <CustomAction Id="ND_start" BinaryKey="CA"\r
          VBScriptCall="ND_StartMeUp" Return="check" />\r
 \r
@@ -1627,16 +1625,13 @@
        <ScheduleReboot After='ChkPreviousInstall'>\r
                REBOOT="FORCE"</ScheduleReboot>\r
 \r
-       <Custom Action="DriverInstall" After='PatchFiles'>\r
+       <Custom Action="DriverInstall" After='InstallServices'>\r
                Not Installed AND Not NODRV </Custom>\r
 \r
        <Custom Action="WSDStart" After='InstallFinalize'>\r
                Not Installed AND Not NODRV </Custom>\r
 \r
-       <Custom Action="OpenSM_start" After="WSDStart">\r
-          ($OpenSM_Service_enabled = 3) AND Not Installed AND Not NODRV</Custom>\r
-\r
-       <Custom Action="ND_start" After="OpenSM_start">\r
+       <Custom Action="ND_start" After="WSDStart">\r
           ($cNetworkDirect = 3) AND Not Installed AND Not NODRV </Custom>\r
 \r
        <Custom Action="BcastRegChanged" After="ND_start">\r

diff --git a/trunk/WinOF/WIX/wlh/x64/wof.wxs b/trunk/WinOF/WIX/wlh/x64/wof.wxs
index 885961da4fa439a9b8bb5a3d47b46743ed1eddf1..b51ff7a6188b713b85c494670962b21d5b37b205 100644 (file)
--- a/trunk/WinOF/WIX/wlh/x64/wof.wxs
+++ b/trunk/WinOF/WIX/wlh/x64/wof.wxs
@@ -1545,6 +1545,13 @@
         <Condition Level="201"> IPOIB_EXISTS </Condition>\r
     </Feature>\r
 \r
+    <Feature Id="fOSMS" Title="OpenSM Service Started" Level="5"\r
+         Description="Open Subnet Management started as a local Windows Service"\r
+         Display="expand" ConfigurableDirectory="INSTALLDIR"\r
+         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
+      <ComponentRef Id="OpenSM_Service_enabled" />\r
+    </Feature>\r
+\r
     <Feature Id="fDAPL" Title="DAPL" Description="DAT+DAPL over InfiniBand"\r
          Display="collapse" Level="1" ConfigurableDirectory="INSTALLDIR"\r
          AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
@@ -1606,13 +1613,6 @@
       <ComponentRef Id="cSRP_driver_installed" />\r
     </Feature>\r
 \r
-    <Feature Id="fOSMS" Title="OpenSM Service Started" Level="5"\r
-         Description="Open Subnet Management started as a Windows Service"\r
-         Display="expand" ConfigurableDirectory="INSTALLDIR"\r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-      <ComponentRef Id="OpenSM_Service_enabled" />\r
-    </Feature>\r
-\r
     <Feature Id="fIBsdk" Title="InfiniBand SDK" Level="2"\r
          Description="InfiniBand Software Development Kit (Headers + Libs)"\r
          Display="expand" ConfigurableDirectory="INSTALLDIR"\r
@@ -1651,9 +1651,6 @@
     <CustomAction Id='WSDStart' BinaryKey='CA'\r
          VBScriptCall='WSDEnable' Return='check' />\r
 \r
-    <CustomAction Id="OpenSM_start" BinaryKey="CA"\r
-         VBScriptCall="OpenSM_StartMeUp" Return="check" />\r
- \r
     <CustomAction Id="ND_start" BinaryKey="CA"\r
          VBScriptCall="ND_StartMeUp" Return="check" />\r
 \r
@@ -1677,16 +1674,13 @@
        <ScheduleReboot After='ChkPreviousInstall'>\r
                REBOOT="FORCE"</ScheduleReboot>\r
 \r
-       <Custom Action="DriverInstall" After='PatchFiles'>\r
+       <Custom Action="DriverInstall" After='InstallServices'>\r
                Not Installed AND Not NODRV </Custom>\r
 \r
        <Custom Action="WSDStart" After='InstallFinalize'>\r
                Not Installed AND Not NODRV </Custom>\r
 \r
-       <Custom Action="OpenSM_start" After="WSDStart">\r
-          ($OpenSM_Service_enabled = 3) AND Not Installed AND Not NODRV</Custom>\r
-\r
-       <Custom Action="ND_start" After="OpenSM_start">\r
+       <Custom Action="ND_start" After="WSDStart">\r
           ($cNetworkDirect = 3) AND Not Installed AND Not NODRV </Custom>\r
 \r
        <Custom Action="BcastRegChanged" After="ND_start">\r

diff --git a/trunk/WinOF/WIX/wlh/x86/wof.wxs b/trunk/WinOF/WIX/wlh/x86/wof.wxs
index 598f12a0c2e3cd5c3c32f094a335739cfce03bab..c23e621d4317299310830caa5b8293750bea4663 100644 (file)
--- a/trunk/WinOF/WIX/wlh/x86/wof.wxs
+++ b/trunk/WinOF/WIX/wlh/x86/wof.wxs
@@ -1435,6 +1435,13 @@
         <ComponentRef Id="cNetworkDirect" />\r
     </Feature>\r
 \r
+    <Feature Id="fOSMS" Title="OpenSM Service Started" Level="5"\r
+        Description="Open Subnet Management started as a local Windows Service"\r
+        Display="expand" ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"\r
+        InstallDefault="local" Absent="allow">\r
+        <ComponentRef Id="OpenSM_Service_enabled" />\r
+    </Feature>\r
+\r
     <Feature Id="fDAPL" Title="DAPL" Description="DAT/DAPL over InfiniBand"\r
         Display="collapse" Level="1" ConfigurableDirectory="INSTALLDIR"\r
         AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
@@ -1500,13 +1507,6 @@
         <ComponentRef Id="cSRP_driver_installed" />\r
     </Feature>\r
 \r
-    <Feature Id="fOSMS" Title="OpenSM Service Started" Level="5"\r
-        Description="Open Subnet Management started as a Windows Service"\r
-        Display="expand" ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"\r
-        InstallDefault="local" Absent="allow">\r
-        <ComponentRef Id="OpenSM_Service_enabled" />\r
-    </Feature>\r
-\r
     <Feature Id="fIBskd" Title="InfiniBand SDK" Level="2"\r
          Description="InfiniBand Software Development Kit (Headers + Libs)"\r
          Display="expand" ConfigurableDirectory="INSTALLDIR"\r
@@ -1545,9 +1545,6 @@
     <CustomAction Id="WSDStart" BinaryKey="CA"\r
          VBScriptCall="WSDEnable" Return="check" />\r
 \r
-    <CustomAction Id="OpenSM_start" BinaryKey="CA"\r
-         VBScriptCall="OpenSM_StartMeUp" Return="check" />\r
-\r
     <CustomAction Id="ND_start" BinaryKey="CA"\r
          VBScriptCall="ND_StartMeUp" Return="check" />\r
 \r
@@ -1571,16 +1568,13 @@
        <ScheduleReboot After="ChkPreviousInstall">\r
            REBOOT="FORCE"</ScheduleReboot>\r
 \r
-       <Custom Action="DriverInstall" After="PatchFiles">\r
+       <Custom Action="DriverInstall" After="InstallServices">\r
                        Not Installed AND Not NODRV </Custom>\r
 \r
        <Custom Action="WSDStart" After="InstallFinalize">\r
            Not Installed AND Not NODRV </Custom>\r
 \r
-       <Custom Action="OpenSM_start" After="WSDStart">\r
-          ($OpenSM_Service_enabled = 3) AND Not Installed AND Not NODRV</Custom>\r
-\r
-       <Custom Action="ND_start" After="OpenSM_start">\r
+       <Custom Action="ND_start" After="WSDStart">\r
           ($cNetworkDirect = 3) AND Not Installed AND Not NODRV </Custom>\r
 \r
        <Custom Action="BcastRegChanged" After="ND_start">\r

diff --git a/trunk/WinOF/WIX/wnet/ia64/wof.wxs b/trunk/WinOF/WIX/wnet/ia64/wof.wxs
index 3d6efb06cab75b2e357a3d385b3e0407a9daf0af..eb0f08a6374906c5d275253e2dca571aebc216d3 100644 (file)
--- a/trunk/WinOF/WIX/wnet/ia64/wof.wxs
+++ b/trunk/WinOF/WIX/wnet/ia64/wof.wxs
@@ -1511,6 +1511,13 @@ End ConnectX remove -->
         <ComponentRef Id="cNetworkDirect" />\r
     </Feature>\r
 -->\r
+    <Feature Id="fOSMS" Title="OpenSM Service Started" Level="5"\r
+         Description="Open Subnet Management started as a local Windows Service"\r
+         Display="expand" ConfigurableDirectory="INSTALLDIR"\r
+         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
+      <ComponentRef Id="OpenSM_Service_enabled" />\r
+    </Feature>\r
+\r
     <Feature Id="fDAPL" Title="DAPL" Description="DAT/DAPL over InfiniBand"\r
          Display="collapse" Level="1" ConfigurableDirectory="INSTALLDIR"\r
          AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
@@ -1572,13 +1579,6 @@ End ConnectX remove -->
       <ComponentRef Id="cSRP_driver_installed" />\r
     </Feature>\r
 \r
-    <Feature Id="fOSMS" Title="OpenSM Service Started" Level="5"\r
-         Description="Open Subnet Management started as a Windows Service"\r
-         Display="expand" ConfigurableDirectory="INSTALLDIR"\r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-      <ComponentRef Id="OpenSM_Service_enabled" />\r
-    </Feature>\r
-\r
     <Feature Id="fIBsdk" Title="InfiniBand SDK" Level="2"\r
          Description="InfiniBand Software Development Kit (Headers + Libs)"\r
          Display="expand" ConfigurableDirectory="INSTALLDIR"\r
@@ -1617,9 +1617,6 @@ End ConnectX remove -->
     <CustomAction Id='WSDStart' BinaryKey='CA'\r
          VBScriptCall='WSDEnable' Return='check' />\r
 \r
-    <CustomAction Id="OpenSM_start" BinaryKey="CA"\r
-         VBScriptCall="OpenSM_StartMeUp" Return="check" />\r
-\r
     <CustomAction Id="ND_start" BinaryKey="CA"\r
          VBScriptCall="ND_StartMeUp" Return="check" />\r
 \r
@@ -1643,16 +1640,13 @@ End ConnectX remove -->
        <ScheduleReboot After='ChkPreviousInstall'>\r
                REBOOT="FORCE"</ScheduleReboot>\r
 \r
-       <Custom Action="DriverInstall" After='PatchFiles'>\r
+       <Custom Action="DriverInstall" After='InstallServices'>\r
                Not Installed AND Not NODRV </Custom>\r
 \r
        <Custom Action="WSDStart" After='InstallFinalize'>\r
                Not Installed AND Not NODRV </Custom>\r
 \r
-       <Custom Action="OpenSM_start" After="WSDStart">\r
-          ($OpenSM_Service_enabled = 3) AND Not Installed AND Not NODRV</Custom>\r
-\r
-       <Custom Action="ND_start" After="OpenSM_start">\r
+       <Custom Action="ND_start" After="WSDStart">\r
           ($cNetworkDirect = 3) AND Not Installed AND Not NODRV </Custom>\r
 \r
        <Custom Action="BcastRegChanged" After="ND_start">\r

diff --git a/trunk/WinOF/WIX/wnet/x64/wof.wxs b/trunk/WinOF/WIX/wnet/x64/wof.wxs
index f9632866f25957b663783c422542f73eb5c3c0e3..770b2174c79b959c5b4b487d8b09a514bc5ed18a 100644 (file)
--- a/trunk/WinOF/WIX/wnet/x64/wof.wxs
+++ b/trunk/WinOF/WIX/wnet/x64/wof.wxs
@@ -1542,6 +1542,13 @@
         <ComponentRef Id="cNetworkDirect" />\r
     </Feature>\r
 \r
+    <Feature Id="fOSMS" Title="OpenSM Service Started" Level="5"\r
+         Description="Open Subnet Management started as a local Windows Service"\r
+         Display="expand" ConfigurableDirectory="INSTALLDIR"\r
+         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
+      <ComponentRef Id="OpenSM_Service_enabled" />\r
+    </Feature>\r
+\r
     <Feature Id="fDAPL" Title="DAPL" Description="DAT+DAPL over InfiniBand"\r
          Display="collapse" Level="1" ConfigurableDirectory="INSTALLDIR"\r
          AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
@@ -1603,13 +1610,6 @@
       <ComponentRef Id="cSRP_driver_installed" />\r
     </Feature>\r
 \r
-    <Feature Id="fOSMS" Title="OpenSM Service Started" Level="5"\r
-         Description="Open Subnet Management started as a Windows Service"\r
-         Display="expand" ConfigurableDirectory="INSTALLDIR"\r
-         AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
-      <ComponentRef Id="OpenSM_Service_enabled" />\r
-    </Feature>\r
-\r
     <Feature Id="fIBsdk" Title="InfiniBand SDK" Level="2"\r
          Description="InfiniBand Software Development Kit (Headers + Libs)"\r
          Display="expand" ConfigurableDirectory="INSTALLDIR"\r
@@ -1648,9 +1648,6 @@
     <CustomAction Id='WSDStart' BinaryKey='CA'\r
          VBScriptCall='WSDEnable' Return='check' />\r
 \r
-    <CustomAction Id="OpenSM_start" BinaryKey="CA"\r
-         VBScriptCall="OpenSM_StartMeUp" Return="check" />\r
- \r
     <CustomAction Id="ND_start" BinaryKey="CA"\r
          VBScriptCall="ND_StartMeUp" Return="check" />\r
 \r
@@ -1674,16 +1671,13 @@
        <ScheduleReboot After='ChkPreviousInstall'>\r
                REBOOT="FORCE"</ScheduleReboot>\r
 \r
-       <Custom Action="DriverInstall" After='PatchFiles'>\r
+       <Custom Action="DriverInstall" After='InstallServices'>\r
                Not Installed AND Not NODRV </Custom>\r
 \r
        <Custom Action="WSDStart" After='InstallFinalize'>\r
                Not Installed AND Not NODRV </Custom>\r
 \r
-       <Custom Action="OpenSM_start" After="WSDStart">\r
-          ($OpenSM_Service_enabled = 3) AND Not Installed AND Not NODRV</Custom>\r
-\r
-       <Custom Action="ND_start" After="OpenSM_start">\r
+       <Custom Action="ND_start" After="WSDStart">\r
           ($cNetworkDirect = 3) AND Not Installed AND Not NODRV </Custom>\r
 \r
        <Custom Action="BcastRegChanged" After="ND_start">\r

diff --git a/trunk/WinOF/WIX/wnet/x86/wof.wxs b/trunk/WinOF/WIX/wnet/x86/wof.wxs
index 6623399a772fecc622f73eefb1bff77319dec199..186c6f705aed4c8db38d8ebecf83e7ad2334d94b 100644 (file)
--- a/trunk/WinOF/WIX/wnet/x86/wof.wxs
+++ b/trunk/WinOF/WIX/wnet/x86/wof.wxs
@@ -1447,6 +1447,13 @@
         <ComponentRef Id="cNetworkDirect" />\r
     </Feature>\r
 \r
+    <Feature Id="fOSMS" Title="OpenSM Service Started" Level="5"\r
+        Description="Open Subnet Management started as a local Windows Service"\r
+        Display="expand" ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"\r
+        InstallDefault="local" Absent="allow">\r
+        <ComponentRef Id="OpenSM_Service_enabled" />\r
+    </Feature>\r
+\r
     <Feature Id="fDAPL" Title="DAPL" Description="DAT/DAPL over InfiniBand"\r
         Display="collapse" Level="1" ConfigurableDirectory="INSTALLDIR"\r
         AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
@@ -1512,13 +1519,6 @@
         <ComponentRef Id="cSRP_driver_installed" />\r
     </Feature>\r
 \r
-    <Feature Id="fOSMS" Title="OpenSM Service Started" Level="5"\r
-        Description="Open Subnet Management started as a Windows Service"\r
-        Display="expand" ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"\r
-        InstallDefault="local" Absent="allow">\r
-        <ComponentRef Id="OpenSM_Service_enabled" />\r
-    </Feature>\r
-\r
     <Feature Id="fIBskd" Title="InfiniBand SDK" Level="2"\r
          Description="InfiniBand Software Development Kit (Headers + Libs)"\r
          Display="expand" ConfigurableDirectory="INSTALLDIR"\r
@@ -1557,9 +1557,6 @@
     <CustomAction Id="WSDStart" BinaryKey="CA"\r
          VBScriptCall="WSDEnable" Return="check" />\r
 \r
-    <CustomAction Id="OpenSM_start" BinaryKey="CA"\r
-         VBScriptCall="OpenSM_StartMeUp" Return="check" />\r
-\r
     <CustomAction Id="ND_start" BinaryKey="CA"\r
          VBScriptCall="ND_StartMeUp" Return="check" />\r
 \r
@@ -1583,16 +1580,13 @@
        <ScheduleReboot After="ChkPreviousInstall">\r
            REBOOT="FORCE"</ScheduleReboot>\r
 \r
-       <Custom Action="DriverInstall" After="PatchFiles">\r
+       <Custom Action="DriverInstall" After="InstallServices">\r
                        Not Installed AND Not NODRV </Custom>\r
 \r
        <Custom Action="WSDStart" After="InstallFinalize">\r
            Not Installed AND Not NODRV </Custom>\r
 \r
-       <Custom Action="OpenSM_start" After="WSDStart">\r
-          ($OpenSM_Service_enabled = 3) AND Not Installed AND Not NODRV</Custom>\r
-\r
-       <Custom Action="ND_start" After="OpenSM_start">\r
+       <Custom Action="ND_start" After="WSDStart">\r
           ($cNetworkDirect = 3) AND Not Installed AND Not NODRV </Custom>\r
 \r
        <Custom Action="BcastRegChanged" After="ND_start">\r

diff --git a/trunk/WinOF/WIX/wxp/x86/wof.wxs b/trunk/WinOF/WIX/wxp/x86/wof.wxs
index bfd9e608a24ba87efc2e8dfb6649b00fae6c1e43..ad1706f3c333c99cd921858705b5a9e023f58f50 100644 (file)
--- a/trunk/WinOF/WIX/wxp/x86/wof.wxs
+++ b/trunk/WinOF/WIX/wxp/x86/wof.wxs
@@ -1441,6 +1441,13 @@
         <ComponentRef Id="cNetworkDirect" />\r
     </Feature>\r
 \r
+    <Feature Id="fOSMS" Title="OpenSM Service Started" Level="5"\r
+        Description="Open Subnet Management started as a local Windows Service"\r
+        Display="expand" ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"\r
+        InstallDefault="local" Absent="allow">\r
+        <ComponentRef Id="OpenSM_Service_enabled" />\r
+    </Feature>\r
+\r
     <Feature Id="fDAPL" Title="DAPL" Description="DAT/DAPL over InfiniBand"\r
         Display="collapse" Level="1" ConfigurableDirectory="INSTALLDIR"\r
         AllowAdvertise="no" InstallDefault="local" Absent="allow">\r
@@ -1510,13 +1517,6 @@
     </Feature>\r
 -->\r
 \r
-    <Feature Id="fOSMS" Title="OpenSM Service Started" Level="5"\r
-        Description="Open Subnet Management started as a Windows Service"\r
-        Display="expand" ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"\r
-        InstallDefault="local" Absent="allow">\r
-        <ComponentRef Id="OpenSM_Service_enabled" />\r
-    </Feature>\r
-\r
     <Feature Id="fIBskd" Title="InfiniBand SDK" Level="2"\r
          Description="InfiniBand Software Development Kit (Headers + Libs)"\r
          Display="expand" ConfigurableDirectory="INSTALLDIR"\r
@@ -1555,9 +1555,6 @@
     <CustomAction Id="WSDStart" BinaryKey="CA"\r
          VBScriptCall="WSDEnable" Return="check" />\r
 \r
-    <CustomAction Id="OpenSM_start" BinaryKey="CA"\r
-         VBScriptCall="OpenSM_StartMeUp" Return="check" />\r
-\r
     <CustomAction Id="ND_start" BinaryKey="CA"\r
          VBScriptCall="ND_StartMeUp" Return="check" />\r
 \r
@@ -1581,16 +1578,13 @@
        <ScheduleReboot After="ChkPreviousInstall">\r
            REBOOT="FORCE"</ScheduleReboot>\r
 \r
-       <Custom Action="DriverInstall" After="PatchFiles">\r
+       <Custom Action="DriverInstall" After="InstallServices">\r
            Not Installed AND Not NODRV </Custom>\r
 \r
        <Custom Action="WSDStart" After="InstallFinalize">\r
            Not Installed AND Not NODRV </Custom>\r
 \r
-       <Custom Action="OpenSM_start" After="WSDStart">\r
-          ($OpenSM_Service_enabled = 3) AND Not Installed AND Not NODRV</Custom>\r
-\r
-       <Custom Action="ND_start" After="OpenSM_start">\r
+       <Custom Action="ND_start" After="WSDStart">\r
           ($cNetworkDirect = 3) AND Not Installed AND Not NODRV </Custom>\r
 \r
        <Custom Action="BcastRegChanged" After="ND_start">\r