[WINOF} Support SW only installs, if the HCA driver installed OK check fails, make...

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

diff --git a/branches/WOF2-2/WinOF/WIX/CustomActions.vbs b/branches/WOF2-2/WinOF/WIX/CustomActions.vbs
index 1cdea2c4a60074560b6be6d2062cf93ec2fadf39..af74bc0ffa40084a3bac2f52c48105705b49d5e2 100644 (file)
--- a/branches/WOF2-2/WinOF/WIX/CustomActions.vbs
+++ b/branches/WOF2-2/WinOF/WIX/CustomActions.vbs
@@ -1549,10 +1549,17 @@ Sub CheckDriversOK()
 \r
        winDir = Session.Property("WindowsFolder")\r
        sInstalldir = Session.Property("INSTALLDIR")\r
+       devman = "cmd.exe /c cd /d " & sInstalldir & "Drivers & devman.exe "\r
        AddLocal = Session.Property("ADDLOCAL")\r
 \r
        ' Check if HCA driver installed OK.\r
        If Not fso.FileExists(winDir & "system32\complib.dll") Then\r
+               ' SW only install, such that there are no hardware HCAs avaiable?\r
+               devList = Find_Dev_by_Tag(WshShell,devman,"find","PCI\VEN_15B3")\r
+               If IsNull(devList) Then\r
+                       Exit Sub\r
+               End If\r
+\r
                ' 10 sec timeout warning box.\r
                WshShell.Popup "WARNING: Possible HCA Driver Startup Failure." _\r
                        & vbCrLf & "  Consult the Windows System Event log! (mlx4_bus)",_\r
@@ -1563,8 +1570,6 @@ Sub CheckDriversOK()
            Exit Sub\r
        End If\r
 \r
-       AddLocal = Session.Property("ADDLOCAL")\r
-\r
        ' empty string implies default install Features which include IPoIB+WSD+ND.\r
        If AddLocal <> "" Then\r
                ' No wait if !IPoIB OR (!WinSockDirect AND !NetworkDirect)\r
@@ -1578,8 +1583,6 @@ Sub CheckDriversOK()
 \r
        ' wait for IPoIB driver to start so ND and/or WSD can install\r
 \r
-       devman = "cmd.exe /c cd /d " & sInstalldir & "Drivers & devman.exe "\r
-\r
        devList = Find_Dev_by_Tag(WshShell,devman,"find","IBA\IPOIB")\r
     too_long = 0\r
 \r