[WinOF] CustomActions.vbs - remove /S switch from dpinst cmd-line as it suppresses...

Install dpinst.xml file so dpinst.exe doesn't complain about not having one.

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

diff --git a/WinOF/WIX/CustomActions.vbs b/WinOF/WIX/CustomActions.vbs
index f74fac7..4895ecf 100644 (file)
--- a/WinOF/WIX/CustomActions.vbs
+++ b/WinOF/WIX/CustomActions.vbs
@@ -818,7 +818,8 @@ Sub dpinst_status(umsg,cmd,err,title)
 \r
        msg = umsg & " (status 0x" & Hex(err) & ") " & vbCrLf & vbCrLf & _\r
                        cmd & vbCrLf & _\r
-                       "  See %windir%\dpinst.log for details" & vbCrLf & vbCrLf\r
+                       "  Details in %windir%\dpinst.log" & vbCrLf & _\r
+                       "          or %windir%\inf\setupapi.dev.log" & vbCrLf & vbCrLf\r
        For I = 0 To 3\r
                S(I) = (err AND 255)\r
                err = err / 256\r
@@ -850,7 +851,7 @@ Function dpinst_install(WshShell,sInstalldir,localSM,IPOIB,VNIC,SRP)
        dpinst = cmdspec & "IBcore & dpinst.exe "\r
        dpinstNET = cmdspec & "net & ..\ibcore\dpinst.exe "\r
 \r
-       cmd = dpinst & "/S /F /SA /SE /SW"\r
+       cmd = dpinst & "/F /SA /SE /SW"\r
 \r
        ' HCA driver install - mlx4 or mthca, dpinst does all .inf files in\r
        ' the current folder.\r

diff --git a/WinOF/WIX/dpinst.xml b/WinOF/WIX/dpinst.xml
new file mode 100644 (file)
index 0000000..653066c
--- /dev/null
+++ b/WinOF/WIX/dpinst.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>\r
+<dpInst>\r
+    <language code="0x0409">\r
+    </language>\r
+</dpInst>\r