From b50f3a4930a5b0fa24252ad035bd2ce8d567ef6d Mon Sep 17 00:00:00 2001
From: stansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Date: Thu, 21 Aug 2008 19:42:59 +0000
Subject: [PATCH] [IPoIB] added ndinstall.exe as part of the ipoib install.

git-svn-id: svn://openib.tc.cornell.edu/gen1@1494 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86
---
 trunk/ulp/ipoib/kernel/ipoib.cdf         |  1 +
 trunk/ulp/ipoib/kernel/ipoib32-xp.cdf    |  3 ++-
 trunk/ulp/ipoib/kernel/ipoib32.cdf       |  1 +
 trunk/ulp/ipoib/kernel/netipoib-xp32.inf | 12 ++++++------
 trunk/ulp/ipoib/kernel/netipoib.inx      |  4 ++++
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/trunk/ulp/ipoib/kernel/ipoib.cdf b/trunk/ulp/ipoib/kernel/ipoib.cdf
index 44a8ab99..eb21da98 100644
--- a/trunk/ulp/ipoib/kernel/ipoib.cdf
+++ b/trunk/ulp/ipoib/kernel/ipoib.cdf
@@ -10,3 +10,4 @@ CATATTR1=0x10010001:OSAttr:2:6.0
 <hash>ibwsd32.dll=ibwsd32.dll
 <hash>ibndprov.dll=ibndprov.dll
 <hash>ibndprov32.dll=ibndprov32.dll
+<hash>ndinstall.exe=ndinstall.exe
diff --git a/trunk/ulp/ipoib/kernel/ipoib32-xp.cdf b/trunk/ulp/ipoib/kernel/ipoib32-xp.cdf
index 49456645..faf8ea6f 100644
--- a/trunk/ulp/ipoib/kernel/ipoib32-xp.cdf
+++ b/trunk/ulp/ipoib/kernel/ipoib32-xp.cdf
@@ -6,4 +6,5 @@ CATATTR1=0x10010001:OSAttr:2:6.0
 [CatalogFiles]
 <hash>netipoib.inf=netipoib.inf
 <hash>ipoib.sys=ipoib.sys
-
+<hash>ibndprov.dll=ibndprov.dll
+<hash>ndinstall.exe=ndinstall.exe
diff --git a/trunk/ulp/ipoib/kernel/ipoib32.cdf b/trunk/ulp/ipoib/kernel/ipoib32.cdf
index 8e984a15..50225ba6 100644
--- a/trunk/ulp/ipoib/kernel/ipoib32.cdf
+++ b/trunk/ulp/ipoib/kernel/ipoib32.cdf
@@ -8,3 +8,4 @@ CATATTR1=0x10010001:OSAttr:2:6.0
 <hash>ipoib.sys=ipoib.sys
 <hash>ibwsd.dll=ibwsd.dll
 <hash>ibndprov.dll=ibndprov.dll
+<hash>ndinstall.exe=ndinstall.exe
diff --git a/trunk/ulp/ipoib/kernel/netipoib-xp32.inf b/trunk/ulp/ipoib/kernel/netipoib-xp32.inf
index a4d6694e..73fa7bae 100644
--- a/trunk/ulp/ipoib/kernel/netipoib-xp32.inf
+++ b/trunk/ulp/ipoib/kernel/netipoib-xp32.inf
@@ -32,12 +32,12 @@ ExcludeFromSelect = IBA\IPoIB
 Characteristics = 0x81 ; NCF_HAS_UI | NCF_VIRTUAL
 AddReg          = IpoibAddReg
 CopyFiles       = IpoibCopyFiles
+CopyFiles       = NdCopyFiles
 
 [Ipoib.DDInstall.ntamd64]
 Characteristics = 0x81 ; NCF_HAS_UI | NCF_VIRTUAL
 AddReg          = IpoibAddReg
 CopyFiles       = IpoibCopyFiles
-CopyFiles       = WsdCopyFiles
 CopyFiles       = NdCopyFiles
 CopyFiles       = WOW64CopyFiles
 
@@ -45,7 +45,6 @@ CopyFiles       = WOW64CopyFiles
 Characteristics = 0x81 ; NCF_HAS_UI | NCF_VIRTUAL
 AddReg          = IpoibAddReg
 CopyFiles       = IpoibCopyFiles
-CopyFiles       = WsdCopyFiles
 CopyFiles       = NdCopyFiles
 CopyFiles       = WOW64CopyFiles
 
@@ -159,11 +158,9 @@ HKR, , TypesSupported,   0x00010001, 7
 [IpoibCopyFiles]
 ipoib.sys,,,2
 
-[WsdCopyFiles]
-ibwsd.dll,,,0x00000002
-
 [NdCopyFiles]
 ibndprov.dll,,,0x00000002
+ndinstall.exe,,,0x00000002
 
 [WOW64CopyFiles]
 ibwsd.dll,ibwsd32.dll,,0x00000002
@@ -180,7 +177,8 @@ ibndprov.dll,ibndprov32.dll,,0x00000002
 
 [SourceDisksFiles.x86]
 ipoib.sys = 1
-
+ibndprov.dll = 1
+ndinstall.exe = 1
 
 [SourceDisksFiles.amd64]
 ipoib.sys = 1
@@ -188,6 +186,7 @@ ibwsd.dll = 1
 ibwsd32.dll = 1
 ibndprov.dll = 1
 ibndprov32.dll = 1
+ndinstall.exe = 1
 
 [SourceDisksFiles.ia64]
 ipoib.sys = 1
@@ -195,6 +194,7 @@ ibwsd.dll = 1
 ibwsd32.dll = 1
 ibndprov.dll = 1
 ibndprov32.dll = 1
+ndinstall.exe = 1
 
 [DestinationDirs]
 IpoibCopyFiles    = %DIRID_DRIVERS%
diff --git a/trunk/ulp/ipoib/kernel/netipoib.inx b/trunk/ulp/ipoib/kernel/netipoib.inx
index 7a769ae9..8b592103 100644
--- a/trunk/ulp/ipoib/kernel/netipoib.inx
+++ b/trunk/ulp/ipoib/kernel/netipoib.inx
@@ -166,6 +166,7 @@ ibwsd.dll,,,0x00000002
 
 [NdCopyFiles]
 ibndprov.dll,,,0x00000002
+ndinstall.exe,,,0x00000002
 
 [WOW64CopyFiles]
 ibwsd.dll,ibwsd32.dll,,0x00000002
@@ -184,6 +185,7 @@ ibndprov.dll,ibndprov32.dll,,0x00000002
 ipoib.sys = 1
 ibwsd.dll = 1
 ibndprov.dll = 1
+ndinstall.exe = 1
 
 [SourceDisksFiles.amd64]
 ipoib.sys = 1
@@ -191,6 +193,7 @@ ibwsd.dll = 1
 ibwsd32.dll = 1
 ibndprov.dll = 1
 ibndprov32.dll = 1
+ndinstall.exe = 1
 
 [SourceDisksFiles.ia64]
 ipoib.sys = 1
@@ -198,6 +201,7 @@ ibwsd.dll = 1
 ibwsd32.dll = 1
 ibndprov.dll = 1
 ibndprov32.dll = 1
+ndinstall.exe = 1
 
 [DestinationDirs]
 IpoibCopyFiles    = %DIRID_DRIVERS%
-- 
2.46.0