From f668310465888418a67d44449995152de17ab71d Mon Sep 17 00:00:00 2001
From: stansmith
Date: Wed, 12 Nov 2008 23:26:20 +0000
Subject: [PATCH] [WinOF] support default HCA device override for unattended
connectX installs: msiexec /i Wof.msi HCA=mlx4 Support WinOF install on HPC
compute nodes, do not install drivers: msiexec /i Wof.msi NODRV=1
git-svn-id: svn://openib.tc.cornell.edu/gen1@1751 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86
---
branches/WinOF/WIX/CustomActions.vbs | 95 ++++++++++++++-----
branches/WinOF/WIX/README.txt | 4 +-
branches/WinOF/WIX/README_checked.txt | 18 ++++
branches/WinOF/WIX/README_release.txt | 15 +--
branches/WinOF/WIX/Release_notes.htm | 131 +++++++++++++++++---------
branches/WinOF/WIX/wlh/ia64/wof.wxs | 10 +-
branches/WinOF/WIX/wlh/x64/wof.wxs | 15 +--
branches/WinOF/WIX/wlh/x86/wof.wxs | 16 ++--
branches/WinOF/WIX/wnet/ia64/wof.wxs | 10 +-
branches/WinOF/WIX/wnet/x64/wof.wxs | 15 +--
branches/WinOF/WIX/wnet/x86/wof.wxs | 17 ++--
branches/WinOF/WIX/wxp/x86/wof.wxs | 16 ++--
12 files changed, 241 insertions(+), 121 deletions(-)
create mode 100644 branches/WinOF/WIX/README_checked.txt
diff --git a/branches/WinOF/WIX/CustomActions.vbs b/branches/WinOF/WIX/CustomActions.vbs
index 86f5da6d..461d4273 100644
--- a/branches/WinOF/WIX/CustomActions.vbs
+++ b/branches/WinOF/WIX/CustomActions.vbs
@@ -35,14 +35,42 @@ End Function
-' A CustomAction (CA) that runs before SetupFinalize as a defered action CA,
-' can only see the properties through 'CustomActionData'
+' A CustomAction (CA) that runs after SetupInitialize which sets up
+' CustomAction Data for the defered action CA DriverInstall().
+' A CA can only see Installer properties through pre-loaded 'CustomActionData'
Sub WinOF_setup
- '
+ dim AddLocal,use_this_HCA
+
+ ' Pre-process ADDLOCAL in order to support msiexec cmd-line override of
+ ' the default InfiniHost HCA.
+ ' msiexec /i WOF_*.msi HCA=mlx
+ ' Replace default InfiniHost HCA driver feature with ConnectX HCA driver if
+ ' so requested.
+ ' The WIX UI (UserInterface) sets up ADDLOCAL. When cmd-line msiexec.exe is
+ ' run with a deprecited UI, then ADDLOCAL is not setup; default it's value
+ ' here.
+
+ Installed = Session.Property("Installed")
+ AddLocal = Session.Property("ADDLOCAL")
+
+ If AddLocal = "" AND Installed = "" Then
+ ' Enable default features.
+ AddLocal = "hca_mthca,HcaDrivers,IBcore,fIPoIB,fWSD,fDAPL,fDatBASIC1,fDatBASIC2"
+ End If
+
+ use_this_HCA = Session.Property("HCA")
+ If use_this_HCA <> "" Then
+ If Instr(use_this_HCA,"mlx") <> 0 Then
+ If Instr(AddLocal,"hca_mthca") <> 0 Then
+ AddLocal = Replace(AddLocal,"hca_mthca","hca_connectX")
+ End If
+ End If
+ End If
+
' Driver Install Properties:
' 0-INSTALLDIR; 1-SystemFolder; 2-System64Folder; 3-WindowsFolder ;
- ' 4-VersionNT; 5-ADDLOCAL; 6-REMOVE
+ ' 4-VersionNT; 5-ADDLOCAL; 6-REMOVE; 7-NODRV
Session.Property("DriverInstall") = _
Session.Property("INSTALLDIR") & ";" & _
@@ -50,8 +78,9 @@ Sub WinOF_setup
Session.Property("System64Folder") & ";" & _
Session.Property("WindowsFolder") & ";" & _
Session.Property("VersionNT") & ";" & _
- Session.Property("ADDLOCAL") & ";" & _
- Session.Property("REMOVE")
+ AddLocal & ";" & _
+ Session.Property("REMOVE") & ";" & _
+ Session.Property("NODRV")
End Sub
@@ -725,7 +754,7 @@ Sub Install_IOU(WshShell,devman)
rc = WshShell.Run (devman & "install ib_iou.inf IBA\IB_IOU",0,true)
If rc <> 0 Then
msgbox "Install_IOU Err(" & rc & ")" & _
- "devman update ib_iou.inf IBA\IB_IOU"
+ "devman install ib_iou.inf IBA\IB_IOU"
End If
Else
On Error Resume Next
@@ -764,7 +793,7 @@ Function DriverInstall()
'in defered action this is the way to pass arguments.
PropArray = Split(Session.Property("CustomActionData"), ";")
Else
- Redim PropArray(7)
+ Redim PropArray(8)
PropArray(0) = Session.Property("INSTALLDIR")
PropArray(1) = Session.Property("SystemFolder")
PropArray(2) = Session.Property("System64Folder")
@@ -772,11 +801,20 @@ Function DriverInstall()
PropArray(4) = Session.Property("VersionNT")
PropArray(5) = Session.Property("ADDLOCAL")
PropArray(6) = Session.Property("REMOVE")
+ PropArray(7) = Session.Property("NODRV")
End If
+ ' If cmd-line specified NODRV=1, then do not install drivers.
+ ' Should not get here with NODRV=1 as WIX src files check.
+ ' Be safe.
+
+ If PropArray(7) <> "" Then
+ Exit Function
+ End If
+
sInstalldir = PropArray(0)
sVersionNT = PropArray(4)
- InstallME = PropArray(5)
+ InstallThis = PropArray(5)
devmanEXE = sInstalldir & "IBcore\devman.exe "
devmanEXE1 = "..\IBcore\devman.exe "
@@ -787,6 +825,7 @@ Function DriverInstall()
devmanWV = "cmd.exe /c cd /d " & sInstalldir & "winverbs & " & devmanEXE1
dpinst = "cmd.exe /c cd /d " & sInstalldir & "IBcore & dpinst.exe "
+ dpinstWV = "cmd.exe /c cd /d " & sInstalldir & "winverbs & ..\IBcore\dpinst.exe "
Set WshShell = CreateObject("WScript.Shell")
Set fso = CreateObject("Scripting.FileSystemObject")
@@ -814,13 +853,10 @@ Function DriverInstall()
have_mlx4 = 0
have_mthca = 0
- If fso.FileExists(sInstalldir & "IBcore\mlx4_hca.inf") Then
- have_mlx4 = 1
- End If
+ ' msgbox "InstallThis " & InstallThis
- If fso.FileExists(sInstalldir & "IBcore\mthca.inf") Then
- have_mthca = 1
- End If
+ have_mlx4 = instr(InstallThis,"hca_connectX")
+ have_mthca = instr(InstallThis,"hca_mthca")
' an HCA driver is 'required'.
If have_mlx4 = 0 AND have_mthca = 0 Then
@@ -938,7 +974,7 @@ Function DriverInstall()
End if
' Check/install IPoIB driver
- If fso.FileExists(sInstalldir & "net\netipoib.inf") Then
+ If instr(InstallThis,"fIPoIB") <> 0 Then
cmd = devmanNET & "update netipoib.inf IBA\IPoIB"
rc = WshShell.Run (cmd,0,true)
If rc <> 0 Then
@@ -951,25 +987,34 @@ Function DriverInstall()
' IB I/O Unit driver installed only if required by VNIC or SRP.
- If fso.FileExists(sInstalldir & "qlgcvnic\netvnic.inf") OR _
- fso.FileExists(sInstalldir & "SRP\ib_srp.inf") Then
- rc = WshShell.Run (devman & "update ib_iou.inf IBA\IB_IOU",0,true)
+ need_SRP = fso.FileExists(sInstalldir & "SRP\ib_srp.inf")
+ need_VNIC = fso.FileExists(sInstalldir & "qlgcvnic\netvnic.inf")
+
+ If need_VNIC OR need_SRP Then
+ rc = WshShell.Run (devman & "install ib_iou.inf IBA\IB_IOU",0,true)
If rc <> 0 Then
- msgbox "IOU Install Err(" & rc & ") update ib_iou.inf IBA\IB_IOU"
+ msgbox "IOU Install Err(" & rc & ") install ib_iou.inf IBA\IB_IOU"
End if
End If
' Install Qlogic VNIC Driver
- If fso.FileExists(sInstalldir & "qlgcvnic\netvnic.inf") Then
+ If need_VNIC Then
Install_VNIC WshShell,devmanQL
End if
' Install SRP (SCSI RDMA Protocol) Driver
- If fso.FileExists(sInstalldir & "SRP\ib_srp.inf") Then
+ If need_SRP Then
Install_SRP WshShell,devmanSRP
End If
If fso.FileExists(sInstalldir & "Xwinverbs\winverbs.inf") Then
+
+ ' install, don't start/insert
+ cmd = dpinstWV & "/S /F /SA /SE /SW /PATH """ & sInstalldir _
+ & "winverbs"""
+
+ Return = WshShell.Run (cmd,0,true)
+
cmd = devmanWV & "classfilter InfinibandController upper +winverbs"
Return = WshShell.Run (cmd,0,true)
If Return <> 1 Then msgbox "winverbs\winverbs.inf(" & Return & ")"
@@ -1086,7 +1131,7 @@ Function Find_IPOIB_LAC()
End Function
-' Remove 3rd party driver package, identified by the string LookFor.
+' Remove 3rd party (OEM) driver package, identified by the string LookFor.
Function remove_INF_file(WshShell,exe,LookFor)
@@ -1101,6 +1146,7 @@ Function remove_INF_file(WshShell,exe,LookFor)
InfFiles = infFilesExec.StdOut.ReadAll
IFILES = Split(InfFiles,vbCrLf)
' msgbox "remove_INF_File LookFor " & LookFor
+ On Error Resume Next
For Each file in IFILES
If (file <> "") Then
If have_devman Then
@@ -1302,10 +1348,11 @@ Function Uninstall_IB_Devices(sInstalldir,sVersionNT,sRemove)
' remove 3rd party driver packages (ibsrp, vnic, ipoib, mthca, Connectx)
cmd = devman
+ remove_INF_file WshShell,cmd,"ibiou"
remove_INF_file WshShell,cmd,"ipoib"
+ remove_INF_file WshShell,dpinst,"winverb"
remove_INF_file WshShell,cmd,"mthca"
remove_INF_file WshShell,cmd,"mlx4_"
- remove_INF_file WshShell,cmd,"ibiou"
Uninstall_IB_Devices = 0
diff --git a/branches/WinOF/WIX/README.txt b/branches/WinOF/WIX/README.txt
index 1b822ded..8143ffea 100644
--- a/branches/WinOF/WIX/README.txt
+++ b/branches/WinOF/WIX/README.txt
@@ -1,4 +1,4 @@
-[11-03-08]
+[11-13-08]
How to generate a Windows OpenFabrics Release (WinOF) using the WIX 2.0 open
source installer tool set ( http://sourceforge.net/projects/wix/ ).
@@ -14,7 +14,7 @@ WinOF Revisions:
1.0 based on svn.614
1.0.1 svn.864
1.1 svn.1177
- 2.0 svn.1722
+ 2.0 svn.1748
diff --git a/branches/WinOF/WIX/README_checked.txt b/branches/WinOF/WIX/README_checked.txt
new file mode 100644
index 00000000..3b8813e7
--- /dev/null
+++ b/branches/WinOF/WIX/README_checked.txt
@@ -0,0 +1,18 @@
+
+Installing Checked drivers which are signed.
+
+For Server 2003 or XP, replace the installed .sys file (%windir%\system32\drivers)
+with the checked version.
+
+
+For Server 2008 or Vista, install with the signed .inf & .cat checked files.
+
+1) Make a copy of the free driver .sys and it's .cat file from the correct install
+ folder in Winof\ {IBcore, net or storage}.
+
+2) Copy checked driver .sys and .cat file from the WinOF\Checked\kernel folder to
+ correct install folder; where free versions were located.
+
+3) Uninstall currently installed free driver; right-click uninstall.
+
+4) Install signed debug from it's inf file using the found new hardware wizard.
diff --git a/branches/WinOF/WIX/README_release.txt b/branches/WinOF/WIX/README_release.txt
index 83c7a718..156f77b4 100644
--- a/branches/WinOF/WIX/README_release.txt
+++ b/branches/WinOF/WIX/README_release.txt
@@ -1,14 +1,14 @@
-[11-06-08] WinOF 2.0 (RC5) release
+[11-13-08] WinOF 2.0 (RC5) release
-Downloads available at http://www.openfabrics.org/downloads/WinOF/v2.0_rc5
+Downloads available at http://www.openfabrics.org/downloads/WinOF/v2.0
WinOF 2.0 Summary Changes
-------------------------
1) The WinOF 2.0 release is based on openib-windows source svn revision
- (branches\WOF2-0 svn.1735).
+ (branches\WOF2-0 svn.1748).
Last WinOF release (1.1) based on svn 1177.
@@ -36,7 +36,8 @@ WinOF 2.0 Summary Changes
Windows Server 2008 and Vista are now supported:
Digitally signed Installer file (.msi).
- Microsoft Network Direct (ND) supported for Windows Server 2008 & Vista
+ Microsoft Network Direct (ND) supported for Windows Server 2008 & Vista;
+ InfiniBand ND provider.
WDK (Windows Driver Kit) build environment used to construct WinOF 2.0
@@ -51,18 +52,18 @@ WinOF 2.0 Summary Changes
Partitioning support - see manual.htm 'part_man.exe'; requires IGMP v2.
LSO (Large Segment Offload) available, enabled if HCA supported.
- WinVerbs: OFED verbs API for Windows
+ WinVerbs: OFED verbs API for Windows (initial alpha release)
4) Kernel mode drivers digitally signed by the OpenFabrics Alliance.
-5) WinOF symbol store available.
+5) Network accessible WinOF symbol store available.
Point windbg at
http://www.openfabrics.org/downloads/WinOF/v2.0/{wlh,wnet,wxp}/SymStor
Free build symbol files (.pdb) installed as
%ProgramFiles%\WinOF\[IBcore,net,srp]
-6) Checked/Debug signed drivers & symbols available as install feature.
+6) Checked/Debug signed drivers & symbols available as an install feature.
diff --git a/branches/WinOF/WIX/Release_notes.htm b/branches/WinOF/WIX/Release_notes.htm
index 452584a6..33b9a0a8 100644
--- a/branches/WinOF/WIX/Release_notes.htm
+++ b/branches/WinOF/WIX/Release_notes.htm
@@ -92,7 +92,7 @@ src=openfabrics.gif>
-11/05/2008
+11/12/2008
@@ -111,7 +111,7 @@ How to Install
+Unattended Install plus Server2008/HPC
Binary
files generated from the OpenIB-windows developers subversion (svn) source tree
'svn://openib.tc.cornell.edu'
-(branches\WOF2-0 svn revision 1735)
+(branches\WOF2-0 svn revision 1748)
are packaged into a WIX 2.0
(Windows Installer Xml) single file install package referred to as the
Windows OpenFabrics (WinOF) release 2.0.
@@ -379,7 +379,7 @@ OpenFabrics manual.
package. Upon reboot, cancel any attempts to install new device hardware from
the "Found New Hardware Wizard".
-If you have previously installed openib-windows, Windows OpenFabrics
+
If you have previously installed openib-windows, WinOF (Windows OpenFabrics)
packages or vendor supplied Infiniband packages, uninstall and reboot prior to
installing this version of Windows OpenFabrics (WinOF).
@@ -416,9 +416,9 @@ drivers for newly discovered PCI device.
From a login with administrator privileges, double-click the
-WinOF_M-m_OSE_arch_setup.msi file to begin the Windows OpenFabrics installation.
-Where 'M-n' indicates Major release number, Minor release number (a.k.a.
-point-release will increment the minor number).
+WinOF_M-m{-p}_OSE_arch.msi file to begin the Windows OpenFabrics installation.
+Where 'M-n{-p}' indicates Major release number, Minor release number, and
+optional point-release number.
OSE - Operating System Environment:
- wlh - (Windows LongHorn) Windows Server 2008, HPC or Vista
@@ -427,7 +427,8 @@ point-release will increment the minor number).
'_arch_' will be one of
- - _x64_ for Intel EMT64 systems or amd64
+ - _x64_ for Intel EMT64 systems or amd64; see
+ x86-64
- _x86_ for x86
compatible systems
- _ia64_ for Intel IA64 systems.
@@ -441,7 +442,8 @@ These non-WHQL'ed driver install questions can not be disabled
via 'My Computer->Properties->Hardware->Driver Signing->Ignore'.
Bottom-line - The digitally signed WinOF drivers in this package are not WHQL'ed
per se, although they are
-built from driver source which has been or is in process of being WHQL'ed.
+built from driver source which has been or is in process of being WHQL'ed by
+hardware vendors which participate in the open source WinOF development process.
**** WARNING ****
@@ -477,7 +479,7 @@ built from driver source which has been or is in process of being WHQL'ed.
- HCA driver - Mellanox: InfiniHost or ConnectX
- IB core stack and libraries.
- Release Notes, Manual
- - Subnet Management [opensm], Performance & Diagnostic tools
+ - Subnet Management service [OpenSM] (installed & disabled), Performance & Diagnostic tools
Optional:
IPoIB - Internet Protocols over
InfiniBand
Winsock Direct (Win2008/3 only)
@@ -502,8 +504,9 @@ built from driver source which has been or is in process of being WHQL'ed.
-
To perform a silent/unattended installation, invoke the following command
- from a command window.
+
To perform a silent/unattended installation for Server 2003/XP, invoke
+ the following command from a command window; Server 2008/HPC see notes
+ below.
start/wait msiexec.exe /i WinOF_2-0_wlh_x64.msi /quiet /log
%TEMP%\WOF_install.log
@@ -516,7 +519,7 @@ built from driver source which has been or is in process of being WHQL'ed.
Documentation
IPoIB - Internet Protocols over InfiniBand
WSD - (Win2K8/3 only, not installed on XP) Win Sock Direct
- ND - Network Direct, started (via ndinstall.exe) only for Server
+ ND - Network Direct, started automatically (via ndinstall.exe) only for Server
2008/HPC and Vista.
DAT & DAPL (v1.1 & v2.0) runtime libraries + dapltest.exe
(dt-svr & dt-cli).
@@ -525,6 +528,51 @@ built from driver source which has been or is in process of being WHQL'ed.
Should WSD not be a desirable unattended install option (Win2008/3 only),
currently you would install unattended then execute the command 'installsp -r'
on each node to remove WSD.
+Server 2008/HPC notes
+Device drivers in WinOF 2.0, and later releases, are Digitally
+signed although they are not WHQL'ed (Windows Quality Hardware Labs) certified. The lack
+of WHQL certification impacts unattended installs by requiring the user to
+'accept'
+installation of the non-WHQL'ed driver the first time a compute node is
+installing WinOF drivers via the WinOF .msi installer. Additionally the non-WHQL
+driver notifier box has a
+checkbox which allows establishing a trust for software from the publisher
+'OpenFabrics Alliance'. Checking this box allows future WinOF driver installs to proceed
+without user intervention as you have indicated to Windows that you trust non-WHQL
+drivers from the Openfabrics Alliance software publisher.
+***** Warning *****
+WinOF .msi installs on compute nodes the first time require human input to 'accept'
+installation of non-WHQL'ed drivers along with establishing a trust for the SW
+publisher 'OpenFabrics Alliance'.
+If one attempts an unattended WinOF .msi install using 'clusrun.bat msiexec /i
+WinOF.....msi /quiet', the install will
+silently hang waiting for user input.
+First time unattended WinOF .msi installs need mouse input to complete.
+Once the SW publisher trust has been established, future unattended WinOF .msi
+installs procees without human input.
+Be aware: if a node is reimaged (saem or different template applied) the
+established trust of OpenFabric Alliance is destroyed, thus the non-WHQL driver
+notifier box and ensuing human input is again required on the first WinOF .msi
+install.
+Windows Deployment Manager usage for HPC compute node provisioning
+Microsoft has chosen the WDM to provision HPC
+cluster compute nodes. WinOF 2.0 supports an administrative install mode which
+is a method to extract the WinOF files without actually installing them,
+thus making WinOF driver files accessible for WDM provisioning.
+msiexec /a WinOF_2-0_wlh_x64.msi TARGETDIR=dev:\path-to-extracted-files
+example: msiexec /a WinOF_2-0_wlh_x64.msi TARGETDIR=C:\windows\Temp\WOF
+(note: TARGETDIR is case sensitive)
+The above command creates the following folder structure:
+
+C:\windows\Temp\WOF\PFiles\WinOF\
+ IBcore\mthca.inf
+Mellanox InfiniHost HCA driver
+ IBcore\mlx4_bus.inf
+Mellanox ConnectX bus driver
+ IBcore\mlx4_hca.inf
+Mellanox ConnectX HCA driver (both ConnectX drivers required).
+ net\netipoib.inf
+IPoIB + Network Direct IB provider + WSD (Winsock Direct) provider.
See Unattended
Installations for further references.
<Return-to-Top>
@@ -787,7 +835,7 @@ the file version; [WinOF-Major.Minor.not-used.svn revision number].
WinOF 1.1 is based on openib-windows
(svn revision 1177 branches\WOF1-1).
- WinOF 2.0 is based on (svn.1735 branches\WOF2-0)
+ WinOF 2.0 is based on (svn.1748 branches\WOF2-0)
<Return-to-Top>
@@ -927,62 +975,59 @@ Once completed, the "New Hardware Found" Wizard pops up again.
+ -
+
In a multi HCA
+ (Host Channel Adapter) system, disabling HCA devices works correctly EXCEPT
+ for disabling the first HCA while other HCAs are operational. Once the first
+ HCA is disabled, existing HCAs and user-mode applications lose the
+ connection to the kernel mode IB stack and will fail when attempting access
+ to the IB stack or hardware.
+ Problem will be addressed in the next WinOF 2.0 release.
+
-
IPoIB partition
multicast
- support requires IGMP (Internet Gateway Management Protocol) v2 Windows default is v3.
-
-
-
Partition
+ support requires IGMP (Internet Gateway Management Protocol) v2 Windows default is v3.
+ Partition
multicast on ipoib will only work if the machine is configured to use
IGMP V2 (and not V3 which is the default).
-
-
To
+ To
configure your machine to use IGMP v2 please do the following:
-
-
-
-
Server
+
+ Server
2003 or XP:
-
-
+
netsh routing ip igmp install
-
-
+
netsh routing ip igmp install add
interface "interface name of IPoIB adapter" igmpprototype=igmprtrv2
-
- If IGMP V3 is still used, please follow the instructions on
+ If IGMP V3 is still used, please follow the instructions on
(http://support.microsoft.com/default.aspx/kb/815752)
-
-
+
+
Server 2008
or
HPC or Vista:
-
-
+
If the netsh command is not
available, then you will need to install via the command 'servermanagercmd.exe
-install NPAS-RRAS-Services'.
-
-
+
netsh
routing ip igmp
install
-
-
+
netsh
routing ip igmp install
add interface "interface name of IPoIB
adapter" igmpprototype=igmprtrv2
-
-
+
+
F
uture WinOF releases
- will support IGMP V3.
-
+ will support IGMP V3.
-
Sometimes an
@@ -1022,7 +1067,7 @@ Once completed, the "New Hardware Found" Wizard pops up again.
bytes.
- Set the registry entry
+ Setting the registry entry
HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\ibsrp\Parameters\ModeFlags
to 1 will
diff --git a/branches/WinOF/WIX/wlh/ia64/wof.wxs b/branches/WinOF/WIX/wlh/ia64/wof.wxs
index 4a142c23..859f9d6c 100644
--- a/branches/WinOF/WIX/wlh/ia64/wof.wxs
+++ b/branches/WinOF/WIX/wlh/ia64/wof.wxs
@@ -3,7 +3,7 @@
WinOF (Windows OpenFabrics) for IA64/IPF Itanium on Windows Server 2008
-->
-
REBOOT="FORCE"
- Not Installed
+ Not Installed AND Not NODRV
- Not Installed
+ Not Installed AND Not NODRV
- ($OpenSM_Service_enabled = 3) AND Not Installed
+ ($OpenSM_Service_enabled = 3) AND Not Installed AND Not NODRV
- ($cNetworkDirect = 3) AND Not Installed
+ ($cNetworkDirect = 3) AND Not Installed AND Not NODRV
Not Installed
diff --git a/branches/WinOF/WIX/wlh/x64/wof.wxs b/branches/WinOF/WIX/wlh/x64/wof.wxs
index 52071011..241c6f2e 100644
--- a/branches/WinOF/WIX/wlh/x64/wof.wxs
+++ b/branches/WinOF/WIX/wlh/x64/wof.wxs
@@ -3,7 +3,7 @@
WinOF (Windows OpenFabrics) for x64 Windows Server 2008 or Vista
-->
-
+
+
+
-
-
@@ -1513,16 +1514,16 @@
REBOOT="FORCE"
- Not Installed
+ Not Installed AND Not NODRV
- Not Installed
+ Not Installed AND Not NODRV
- ($OpenSM_Service_enabled = 3) AND Not Installed
+ ($OpenSM_Service_enabled = 3) AND Not Installed AND Not NODRV
- ($cNetworkDirect = 3) AND Not Installed
+ ($cNetworkDirect = 3) AND Not Installed AND Not NODRV
Not Installed
diff --git a/branches/WinOF/WIX/wlh/x86/wof.wxs b/branches/WinOF/WIX/wlh/x86/wof.wxs
index 76535692..f3ecdbb6 100644
--- a/branches/WinOF/WIX/wlh/x86/wof.wxs
+++ b/branches/WinOF/WIX/wlh/x86/wof.wxs
@@ -4,7 +4,7 @@
-->
-
+
+
+
-
-
@@ -1408,16 +1409,17 @@
REBOOT="FORCE"
- Not Installed
+
+ Not Installed AND Not NODRV
- Not Installed
+ Not Installed AND Not NODRV
- ($OpenSM_Service_enabled = 3) AND Not Installed
+ ($OpenSM_Service_enabled = 3) AND Not Installed AND Not NODRV
- ($cNetworkDirect = 3) AND Not Installed
+ ($cNetworkDirect = 3) AND Not Installed AND Not NODRV
Not Installed
diff --git a/branches/WinOF/WIX/wnet/ia64/wof.wxs b/branches/WinOF/WIX/wnet/ia64/wof.wxs
index 4d0efbb8..d2235b31 100644
--- a/branches/WinOF/WIX/wnet/ia64/wof.wxs
+++ b/branches/WinOF/WIX/wnet/ia64/wof.wxs
@@ -3,7 +3,7 @@
WinOF for IA64/IPF Itanium on Windows Server 2003
-->
-
REBOOT="FORCE"
- Not Installed
+ Not Installed AND Not NODRV
- Not Installed
+ Not Installed AND Not NODRV
- ($OpenSM_Service_enabled = 3) AND Not Installed
+ ($OpenSM_Service_enabled = 3) AND Not Installed AND Not NODRV
- ($cNetworkDirect = 3) AND Not Installed
+ ($cNetworkDirect = 3) AND Not Installed AND Not NODRV
Not Installed
diff --git a/branches/WinOF/WIX/wnet/x64/wof.wxs b/branches/WinOF/WIX/wnet/x64/wof.wxs
index fc6af0c1..b73c23ef 100644
--- a/branches/WinOF/WIX/wnet/x64/wof.wxs
+++ b/branches/WinOF/WIX/wnet/x64/wof.wxs
@@ -3,7 +3,7 @@
WinOF for x64 Windows Server 2003 or XP64
-->
-
+
+
+
-
-
@@ -1512,16 +1513,16 @@
REBOOT="FORCE"
- Not Installed
+ Not Installed AND Not NODRV
- Not Installed
+ Not Installed AND Not NODRV
- ($OpenSM_Service_enabled = 3) AND Not Installed
+ ($OpenSM_Service_enabled = 3) AND Not Installed AND Not NODRV
- ($cNetworkDirect = 3) AND Not Installed
+ ($cNetworkDirect = 3) AND Not Installed AND Not NODRV
Not Installed
diff --git a/branches/WinOF/WIX/wnet/x86/wof.wxs b/branches/WinOF/WIX/wnet/x86/wof.wxs
index 82421c21..8d573523 100644
--- a/branches/WinOF/WIX/wnet/x86/wof.wxs
+++ b/branches/WinOF/WIX/wnet/x86/wof.wxs
@@ -4,7 +4,7 @@
-->
-
+
+
+
-
-
@@ -1409,16 +1410,17 @@
REBOOT="FORCE"
- Not Installed
+
+ Not Installed AND Not NODRV
- Not Installed
+ Not Installed AND Not NODRV
- ($OpenSM_Service_enabled = 3) AND Not Installed
+ ($OpenSM_Service_enabled = 3) AND Not Installed AND Not NODRV
- ($cNetworkDirect = 3) AND Not Installed
+ ($cNetworkDirect = 3) AND Not Installed AND Not NODRV
Not Installed
@@ -1430,6 +1432,7 @@
REMOVE ONLY !-->
REMOVE="ALL"
+
REMOVE="ALL"
diff --git a/branches/WinOF/WIX/wxp/x86/wof.wxs b/branches/WinOF/WIX/wxp/x86/wof.wxs
index aac31755..1a7997b5 100644
--- a/branches/WinOF/WIX/wxp/x86/wof.wxs
+++ b/branches/WinOF/WIX/wxp/x86/wof.wxs
@@ -4,7 +4,7 @@
-->
-
+
+
+
-
-
@@ -1412,16 +1413,17 @@
REBOOT="FORCE"
- Not Installed
+
+ Not Installed AND Not NODRV
- Not Installed
+ Not Installed AND Not NODRV
- ($OpenSM_Service_enabled = 3) AND Not Installed
+ ($OpenSM_Service_enabled = 3) AND Not Installed AND Not NODRV
- ($cNetworkDirect = 3) AND Not Installed
+ ($cNetworkDirect = 3) AND Not Installed AND Not NODRV
Not Installed
--
2.46.0