[WIX] Account for changes in ndinstall.exe cmd line interface.
authorstansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Wed, 15 Jul 2009 19:56:37 +0000 (19:56 +0000)
committerstansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Wed, 15 Jul 2009 19:56:37 +0000 (19:56 +0000)
git-svn-id: svn://openib.tc.cornell.edu/gen1/trunk@2299 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

WinOF/WIX/CustomActions.vbs

index 5ffbac0..e07700d 100644 (file)
@@ -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", 0, true)\r
+                                  "Drivers\net & ndinstall.exe -r ibal", 0, true)\r
        End If\r
        \r
        ' WSD is not supported on XP and should NOT have been installed.\r
@@ -1510,7 +1510,7 @@ End Sub
 ' See WIX src file - ND_start\r
 \r
 Sub ND_StartMeUp()\r
-      Dim sInstalldir, WshShell, fso\r
+      Dim Ret, sInstalldir, WshShell, fso\r
 \r
       sInstalldir = Session.Property("INSTALLDIR")\r
 \r
@@ -1520,9 +1520,9 @@ Sub ND_StartMeUp()
     ' Start the Network Direct Service if installed\r
 \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 -i", 0, true)\r
-        If Err Then ShowErr2("ND service install failed")\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
     End If\r
 \r
 End Sub\r