From 2e9a49353bbfe1bcb1a88a06e59edd2a4f6e9d43 Mon Sep 17 00:00:00 2001
From: Stan Smith <stan.smith@intel.com>
Date: Thu, 18 Mar 2010 18:32:47 +0000
Subject: [PATCH] [OFED] Remove ia64 restriction for NetworkDirect as it now
 uses winverbs as the ND provider. Test if HCA driver actually installed.

git-svn-id: svn://openib.tc.cornell.edu/gen1@2745 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86
---
 trunk/OFED/WIX/common/InstallExecuteSeq.inc | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/trunk/OFED/WIX/common/InstallExecuteSeq.inc b/trunk/OFED/WIX/common/InstallExecuteSeq.inc
index 05837b05..382f1ff9 100644
--- a/trunk/OFED/WIX/common/InstallExecuteSeq.inc
+++ b/trunk/OFED/WIX/common/InstallExecuteSeq.inc
@@ -18,13 +18,14 @@
     <CustomAction Id="IB_DriverCleanup" BinaryKey="CA"
          VBScriptCall="IB_DriverCleanup" Return="check" />
 
+    <CustomAction Id="CheckDriversOK" BinaryKey="CA"
+         VBScriptCall="CheckDriversOK" Return="check" />
+
     <CustomAction Id="WSDStart" BinaryKey="CA"
          VBScriptCall="WSDEnable" Return="check" />
 
-<?if $(var.ARCHP) != "ia64" ?>
     <CustomAction Id="ND_start" BinaryKey="CA"
          VBScriptCall="ND_StartMeUp" Return="check" />
-<?endif?>
 
     <CustomAction Id="HammerTime" BinaryKey="CA"
          VBScriptCall="HammerTime" Return="check" />
@@ -47,19 +48,17 @@
        <Custom Action="DriverInstall" After='InstallServices'>
                Not Installed AND Not NODRV </Custom>
 
-       <Custom Action="WSDStart" After="InstallFinalize">
+       <Custom Action="CheckDriversOK" After="InstallFinalize">
+               Not Installed AND Not NODRV </Custom>
+
+       <Custom Action="WSDStart" After="CheckDriversOK">
                Not Installed AND Not NODRV </Custom>
 
-<?if $(var.ARCHP) != "ia64" ?>
        <Custom Action="ND_start" After="WSDStart">
           ($cNetworkDirect = 3) AND Not Installed AND Not NODRV </Custom>
 
        <Custom Action="BcastRegChanged" After="ND_start">
                Not Installed</Custom>
-<?else?>
-       <Custom Action="BcastRegChanged" After="WSDStart">
-               Not Installed</Custom>
-<?endif?>
 
        <!--> CHANGE ONLY </!-->
        <Custom Action="InstallChanged" After="InstallFinalize">
-- 
2.46.0