[OFED] Remove ia64 restriction for NetworkDirect as it now uses winverbs as the ND...
authorstansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Thu, 18 Mar 2010 18:32:47 +0000 (18:32 +0000)
committerstansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Thu, 18 Mar 2010 18:32:47 +0000 (18:32 +0000)
Test if HCA driver actually installed.

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

OFED/WIX/common/InstallExecuteSeq.inc

index 05837b0..382f1ff 100644 (file)
     <CustomAction Id="IB_DriverCleanup" BinaryKey="CA"\r
          VBScriptCall="IB_DriverCleanup" Return="check" />\r
 \r
+    <CustomAction Id="CheckDriversOK" BinaryKey="CA"\r
+         VBScriptCall="CheckDriversOK" Return="check" />\r
+\r
     <CustomAction Id="WSDStart" BinaryKey="CA"\r
          VBScriptCall="WSDEnable" Return="check" />\r
 \r
-<?if $(var.ARCHP) != "ia64" ?>\r
     <CustomAction Id="ND_start" BinaryKey="CA"\r
          VBScriptCall="ND_StartMeUp" Return="check" />\r
-<?endif?>\r
 \r
     <CustomAction Id="HammerTime" BinaryKey="CA"\r
          VBScriptCall="HammerTime" Return="check" />\r
        <Custom Action="DriverInstall" After='InstallServices'>\r
                Not Installed AND Not NODRV </Custom>\r
 \r
-       <Custom Action="WSDStart" After="InstallFinalize">\r
+       <Custom Action="CheckDriversOK" After="InstallFinalize">\r
+               Not Installed AND Not NODRV </Custom>\r
+\r
+       <Custom Action="WSDStart" After="CheckDriversOK">\r
                Not Installed AND Not NODRV </Custom>\r
 \r
-<?if $(var.ARCHP) != "ia64" ?>\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
                Not Installed</Custom>\r
-<?else?>\r
-       <Custom Action="BcastRegChanged" After="WSDStart">\r
-               Not Installed</Custom>\r
-<?endif?>\r
 \r
        <!--> CHANGE ONLY </!-->\r
        <Custom Action="InstallChanged" After="InstallFinalize">\r