From: stansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Date: Thu, 16 Jul 2009 22:58:22 +0000 (+0000)
Subject: [WINOF] Revert back to original ndinstall.exe invocation as a 'default' ND provider... 
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=38e1467b121e63130b5a42a16fc72148c8785bad;p=~shefty%2Frdma-win.git

[WINOF] Revert back to original ndinstall.exe invocation as a 'default' ND provider is now provided.

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

diff --git a/branches/WOF2-1/WinOF/WIX/CustomActions.vbs b/branches/WOF2-1/WinOF/WIX/CustomActions.vbs
index e07700d1..1abca360 100644
--- a/branches/WOF2-1/WinOF/WIX/CustomActions.vbs
+++ b/branches/WOF2-1/WinOF/WIX/CustomActions.vbs
@@ -1380,7 +1380,7 @@ Sub DriverUninstall()
 
 	If fso.FileExists(sInstalldir & "Drivers\net\ndinstall.exe") Then
 	    Return = WshShell.Run ("cmd.exe /c cd /d " & sInstalldir & _
-	                           "Drivers\net & ndinstall.exe -r ibal", 0, true)
+	                           "Drivers\net & ndinstall.exe -q -r", 0, true)
 	End If
 	
 	' WSD is not supported on XP and should NOT have been installed.
@@ -1521,8 +1521,8 @@ Sub ND_StartMeUp()
 
     If fso.FileExists(sInstalldir & "Drivers\net\ndinstall.exe") Then
         Ret = WshShell.Run ("cmd.exe /c cd /d " & sInstalldir _
-                              & " & Drivers\net\ndinstall.exe -i ibal", 0, true)
-        If Ret Then ShowErr2("ND service [ibal] install failed")
+                              & " & Drivers\net\ndinstall.exe -q -i", 0, true)
+        If Ret Then ShowErr2("ND service provider install failed")
     End If
 
 End Sub
diff --git a/trunk/WinOF/WIX/CustomActions.vbs b/trunk/WinOF/WIX/CustomActions.vbs
index e07700d1..1abca360 100644
--- a/trunk/WinOF/WIX/CustomActions.vbs
+++ b/trunk/WinOF/WIX/CustomActions.vbs
@@ -1380,7 +1380,7 @@ Sub DriverUninstall()
 
 	If fso.FileExists(sInstalldir & "Drivers\net\ndinstall.exe") Then
 	    Return = WshShell.Run ("cmd.exe /c cd /d " & sInstalldir & _
-	                           "Drivers\net & ndinstall.exe -r ibal", 0, true)
+	                           "Drivers\net & ndinstall.exe -q -r", 0, true)
 	End If
 	
 	' WSD is not supported on XP and should NOT have been installed.
@@ -1521,8 +1521,8 @@ Sub ND_StartMeUp()
 
     If fso.FileExists(sInstalldir & "Drivers\net\ndinstall.exe") Then
         Ret = WshShell.Run ("cmd.exe /c cd /d " & sInstalldir _
-                              & " & Drivers\net\ndinstall.exe -i ibal", 0, true)
-        If Ret Then ShowErr2("ND service [ibal] install failed")
+                              & " & Drivers\net\ndinstall.exe -q -i", 0, true)
+        If Ret Then ShowErr2("ND service provider install failed")
     End If
 
 End Sub