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

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

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