[WinOF] Reflect WinOF installs into %ProgramFiles%. Use signature from from new OFA...

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

diff --git a/trunk/WinOF/WIX/HPC/cert-add.bat b/trunk/WinOF/WIX/HPC/cert-add.bat
index c3374c8d25acdc754d8d8c97db5906ae16145dc7..49e3349e307c573bc81009f51ca5805bdac32de6 100644 (file)
--- a/trunk/WinOF/WIX/HPC/cert-add.bat
+++ b/trunk/WinOF/WIX/HPC/cert-add.bat
@@ -41,7 +41,7 @@ set CISF=rem-cert-ADD.bat
 if exist "%CISF%"  (\r
     set CIS="%CD%\%CISF%"\r
 ) else (\r
-    set CIS="%ProgramFiles(x86)%\WinOF\%CISF%"\r
+    set CIS="%ProgramFiles%\WinOF\%CISF%"\r
 )\r
 \r
 if not exist %CIS% (\r
@@ -51,9 +51,11 @@ if not exist %CIS% (
 \r
 rem Certificate ID's (Serial Number) for the OFA WinOF driver signing cert\r
 \r
-set OfaWinOfCertID=71175fca6b85d5c2e0864df16349ad84\r
+rem [expired 8/20/09] set OFA_CERT_ID=71175fca6b85d5c2e0864df16349ad84\r
+rem [expires 8/20/2011]\r
+set OFA_CERT_ID=765c1a5b6e0fcad96ae0c35cd2f9523e\r
 \r
-rem Opoenfabrics Alliance Trusted SW Publisher\r
+rem Openfabrics Alliance Trusted SW Publisher\r
 set CERTNAME=OFA_TP.cer\r
 \r
 if exist "%CERTNAME%" (\r
@@ -62,10 +64,9 @@ if exist "%CERTNAME%" (
 )\r
 \r
 rem extract OFA cert from local Trusted Publisher Cert Store.\r
-\r
 rem test for OFA cert in local TrustedPublisher cert store\r
 \r
-certutil -store TRUSTEDPUBLISHER %OfaWinOfCertID%  1> Nul\r
+certutil -store TRUSTEDPUBLISHER %OFA_CERT_ID%  1> Nul\r
 IF %ERRORLEVEL% NEQ 0 (\r
     echo 'OpenFabrics Alliance' Trusted SW Publisher certificate not in local Cert Store.\r
     echo Install WinOF on head-node or Install OFA Cert from WinOF installer .msi file.\r
@@ -79,7 +80,7 @@ IF %ERRORLEVEL% NEQ 0 (
 \r
 rem Extract OFA cert to %CERTNAME% file.\r
 if EXIST "%CERTNAME%"  del /F/Q %CERTNAME%\r
-certutil -store TRUSTEDPUBLISHER %OfaWinOfCertID% %CERTNAME% 1> Nul\r
+certutil -store TRUSTEDPUBLISHER %OFA_CERT_ID% %CERTNAME% 1> Nul\r
 IF %ERRORLEVEL% NEQ 0 (\r
     echo Unable to extract OFA cert from local Trusted Publisher Store err %ERRORLEVEL%\r
     exit /B 1\r
@@ -122,8 +123,8 @@ if "%2" == "" (
 \r
 :again\r
 \r
-rem  echo call clusrun /node:%1 %1\%CISF% %OfaWinOfCertID% %1\%CERTNAME%\r
-  clusrun /nodes:%2 %1\%CISF% %OfaWinOfCertID% %1\%CERTNAME%\r
+rem  echo call clusrun /node:%1 %1\%CISF% %OFA_CERT_ID% %1\%CERTNAME%\r
+  clusrun /nodes:%2 %1\%CISF% %OFA_CERT_ID% %1\%CERTNAME%\r
   shift /2\r
   if "%2" == "" goto cpy_cleanup\r
   timeout /T 5\r