Revision: 2745 Author: stansmith Date: 11:32:47 AM, Thursday, March 18, 2010 Message: [OFED] Remove ia64 restriction for NetworkDirect as it now uses winverbs as the ND provider. Test if HCA driver actually installed.
signed-off-by: stan smith <[email protected]> ---- Modified : /gen1/trunk/OFED/WIX/common/InstallExecuteSeq.inc --- a/trunk/OFED/WIX/common/InstallExecuteSeq.inc Thu Mar 18 11:33:41 2010 +++ b/trunk/OFED/WIX/common/InstallExecuteSeq.inc Mon Feb 22 14:33:47 2010 @@ -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"> _______________________________________________ ofw mailing list [email protected] http://lists.openfabrics.org/cgi-bin/mailman/listinfo/ofw
