From 0664e28257ed8112da77a698d078e1878fc34ce5 Mon Sep 17 00:00:00 2001 From: Stan Smith Date: Wed, 10 Mar 2010 22:35:48 +0000 Subject: [PATCH] [WINOF} Support SW only installs, if the HCA driver installed OK check fails, make sure there is an HCA device. git-svn-id: svn://openib.tc.cornell.edu/gen1@2733 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86 --- branches/WOF2-2/WinOF/WIX/CustomActions.vbs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/branches/WOF2-2/WinOF/WIX/CustomActions.vbs b/branches/WOF2-2/WinOF/WIX/CustomActions.vbs index 1cdea2c4..af74bc0f 100644 --- a/branches/WOF2-2/WinOF/WIX/CustomActions.vbs +++ b/branches/WOF2-2/WinOF/WIX/CustomActions.vbs @@ -1549,10 +1549,17 @@ Sub CheckDriversOK() winDir = Session.Property("WindowsFolder") sInstalldir = Session.Property("INSTALLDIR") + devman = "cmd.exe /c cd /d " & sInstalldir & "Drivers & devman.exe " AddLocal = Session.Property("ADDLOCAL") ' Check if HCA driver installed OK. If Not fso.FileExists(winDir & "system32\complib.dll") Then + ' SW only install, such that there are no hardware HCAs avaiable? + devList = Find_Dev_by_Tag(WshShell,devman,"find","PCI\VEN_15B3") + If IsNull(devList) Then + Exit Sub + End If + ' 10 sec timeout warning box. WshShell.Popup "WARNING: Possible HCA Driver Startup Failure." _ & vbCrLf & " Consult the Windows System Event log! (mlx4_bus)",_ @@ -1563,8 +1570,6 @@ Sub CheckDriversOK() Exit Sub End If - AddLocal = Session.Property("ADDLOCAL") - ' empty string implies default install Features which include IPoIB+WSD+ND. If AddLocal <> "" Then ' No wait if !IPoIB OR (!WinSockDirect AND !NetworkDirect) @@ -1578,8 +1583,6 @@ Sub CheckDriversOK() ' wait for IPoIB driver to start so ND and/or WSD can install - devman = "cmd.exe /c cd /d " & sInstalldir & "Drivers & devman.exe " - devList = Find_Dev_by_Tag(WshShell,devman,"find","IBA\IPOIB") too_long = 0 -- 2.46.0