From f3e44ca4e6a0daa69c73bd688994a8c426c3da75 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 1 Feb 2013 20:23:25 +0000
Subject: [PATCH] Fix Windows template driver path to be consistent with
 suggested driver layout.  This is a backwards compatible change.

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@15038 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 .../share/xcat/install/hyperv/hypervisor.hyperv2012.x86_64.tmpl | 2 +-
 .../xcat/install/hyperv/hypervisor.hyperv2012.x86_64.tmpl.uefi  | 2 +-
 .../share/xcat/install/windows/datacenter.win2012.x86_64.tmpl   | 2 +-
 .../xcat/install/windows/datacenter.win2012.x86_64.tmpl.uefi    | 2 +-
 .../share/xcat/install/windows/enterprise.win2k8.x86_64.tmpl    | 2 +-
 .../share/xcat/install/windows/enterprise.win2k8r2.x86_64.tmpl  | 2 +-
 .../xcat/install/windows/enterprise.win2k8r2.x86_64.tmpl.uefi   | 2 +-
 .../share/xcat/install/windows/enterprise.win7.x86_64.tmpl      | 2 +-
 .../share/xcat/install/windows/enterprise.win7.x86_64.tmpl.uefi | 2 +-
 .../share/xcat/install/windows/enterprise.win8.x86_64.tmpl      | 2 +-
 .../share/xcat/install/windows/enterprise.win8.x86_64.tmpl.uefi | 2 +-
 .../xcat/install/windows/enterprise_ad.win2k8r2.x86_64.tmpl     | 2 +-
 .../install/windows/enterprise_ad.win2k8r2.x86_64.tmpl.uefi     | 2 +-
 .../share/xcat/install/windows/standard.win2012.x86_64.tmpl     | 2 +-
 .../xcat/install/windows/standard.win2012.x86_64.tmpl.uefi      | 2 +-
 .../share/xcat/install/windows/standard.win2k8.x86_64.tmpl      | 2 +-
 .../share/xcat/install/windows/ultimate.win7.x86_64.tmpl        | 2 +-
 17 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/xCAT-server/share/xcat/install/hyperv/hypervisor.hyperv2012.x86_64.tmpl b/xCAT-server/share/xcat/install/hyperv/hypervisor.hyperv2012.x86_64.tmpl
index a0049a129..0ff886021 100644
--- a/xCAT-server/share/xcat/install/hyperv/hypervisor.hyperv2012.x86_64.tmpl
+++ b/xCAT-server/share/xcat/install/hyperv/hypervisor.hyperv2012.x86_64.tmpl
@@ -52,7 +52,7 @@
         <component name="Microsoft-Windows-PnpCustomizationsNonWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
             <DriverPaths>
                 <PathAndCredentials wcm:action="add" wcm:keyValue="1">
-                    <Path>I:\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch#\Drivers</Path>
+                    <Path>I:\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch#</Path>
                 </PathAndCredentials>
             </DriverPaths>
         </component>
diff --git a/xCAT-server/share/xcat/install/hyperv/hypervisor.hyperv2012.x86_64.tmpl.uefi b/xCAT-server/share/xcat/install/hyperv/hypervisor.hyperv2012.x86_64.tmpl.uefi
index 0f7325dbb..c847e7b03 100644
--- a/xCAT-server/share/xcat/install/hyperv/hypervisor.hyperv2012.x86_64.tmpl.uefi
+++ b/xCAT-server/share/xcat/install/hyperv/hypervisor.hyperv2012.x86_64.tmpl.uefi
@@ -62,7 +62,7 @@
         <component name="Microsoft-Windows-PnpCustomizationsNonWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
             <DriverPaths>
                 <PathAndCredentials wcm:action="add" wcm:keyValue="1">
-                    <Path>I:\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch#\Drivers</Path>
+                    <Path>I:\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch#</Path>
                 </PathAndCredentials>
             </DriverPaths>
         </component>
diff --git a/xCAT-server/share/xcat/install/windows/datacenter.win2012.x86_64.tmpl b/xCAT-server/share/xcat/install/windows/datacenter.win2012.x86_64.tmpl
index 10c3269aa..791a703fc 100644
--- a/xCAT-server/share/xcat/install/windows/datacenter.win2012.x86_64.tmpl
+++ b/xCAT-server/share/xcat/install/windows/datacenter.win2012.x86_64.tmpl
@@ -53,7 +53,7 @@
         <component name="Microsoft-Windows-PnpCustomizationsNonWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
             <DriverPaths>
                 <PathAndCredentials wcm:action="add" wcm:keyValue="1">
-                    <Path>I:\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch#\Drivers</Path>
+                    <Path>I:\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch#</Path>
                 </PathAndCredentials>
             </DriverPaths>
         </component>
diff --git a/xCAT-server/share/xcat/install/windows/datacenter.win2012.x86_64.tmpl.uefi b/xCAT-server/share/xcat/install/windows/datacenter.win2012.x86_64.tmpl.uefi
index d203e99dc..b8827bac0 100644
--- a/xCAT-server/share/xcat/install/windows/datacenter.win2012.x86_64.tmpl.uefi
+++ b/xCAT-server/share/xcat/install/windows/datacenter.win2012.x86_64.tmpl.uefi
@@ -65,7 +65,7 @@
         <component name="Microsoft-Windows-PnpCustomizationsNonWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
             <DriverPaths>
                 <PathAndCredentials wcm:action="add" wcm:keyValue="1">
-                    <Path>I:\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch#\Drivers</Path>
+                    <Path>I:\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch#</Path>
                 </PathAndCredentials>
             </DriverPaths>
         </component>
diff --git a/xCAT-server/share/xcat/install/windows/enterprise.win2k8.x86_64.tmpl b/xCAT-server/share/xcat/install/windows/enterprise.win2k8.x86_64.tmpl
index f8fb4f5f9..aa460d47a 100644
--- a/xCAT-server/share/xcat/install/windows/enterprise.win2k8.x86_64.tmpl
+++ b/xCAT-server/share/xcat/install/windows/enterprise.win2k8.x86_64.tmpl
@@ -58,7 +58,7 @@
         <component name="Microsoft-Windows-PnpCustomizationsNonWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
             <DriverPaths>
                 <PathAndCredentials wcm:action="add" wcm:keyValue="1">
-                    <Path>I:\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch#\Drivers</Path>
+                    <Path>I:\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch#</Path>
                 </PathAndCredentials>
             </DriverPaths>
         </component>
diff --git a/xCAT-server/share/xcat/install/windows/enterprise.win2k8r2.x86_64.tmpl b/xCAT-server/share/xcat/install/windows/enterprise.win2k8r2.x86_64.tmpl
index b1c36961f..230b0fab8 100644
--- a/xCAT-server/share/xcat/install/windows/enterprise.win2k8r2.x86_64.tmpl
+++ b/xCAT-server/share/xcat/install/windows/enterprise.win2k8r2.x86_64.tmpl
@@ -54,7 +54,7 @@
         <component name="Microsoft-Windows-PnpCustomizationsNonWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
             <DriverPaths>
                 <PathAndCredentials wcm:action="add" wcm:keyValue="1">
-                    <Path>I:\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch#\Drivers</Path>
+                    <Path>I:\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch#</Path>
                 </PathAndCredentials>
             </DriverPaths>
         </component>
diff --git a/xCAT-server/share/xcat/install/windows/enterprise.win2k8r2.x86_64.tmpl.uefi b/xCAT-server/share/xcat/install/windows/enterprise.win2k8r2.x86_64.tmpl.uefi
index a240689bc..aee08c8a8 100644
--- a/xCAT-server/share/xcat/install/windows/enterprise.win2k8r2.x86_64.tmpl.uefi
+++ b/xCAT-server/share/xcat/install/windows/enterprise.win2k8r2.x86_64.tmpl.uefi
@@ -64,7 +64,7 @@
         <component name="Microsoft-Windows-PnpCustomizationsNonWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
             <DriverPaths>
                 <PathAndCredentials wcm:action="add" wcm:keyValue="1">
-                    <Path>I:\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch#\Drivers</Path>
+                    <Path>I:\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch#</Path>
                 </PathAndCredentials>
             </DriverPaths>
         </component>
diff --git a/xCAT-server/share/xcat/install/windows/enterprise.win7.x86_64.tmpl b/xCAT-server/share/xcat/install/windows/enterprise.win7.x86_64.tmpl
index c6891d8a9..e3ccd00c7 100755
--- a/xCAT-server/share/xcat/install/windows/enterprise.win7.x86_64.tmpl
+++ b/xCAT-server/share/xcat/install/windows/enterprise.win7.x86_64.tmpl
@@ -77,7 +77,7 @@
         <component name="Microsoft-Windows-PnpCustomizationsNonWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
             <DriverPaths>
                 <PathAndCredentials wcm:action="add" wcm:keyValue="1">
-                    <Path>i:\drivers\win7\x86_64\Drivers</Path>
+                    <Path>i:\drivers\win7\x86_64</Path>
                 </PathAndCredentials>
             </DriverPaths>
         </component>
diff --git a/xCAT-server/share/xcat/install/windows/enterprise.win7.x86_64.tmpl.uefi b/xCAT-server/share/xcat/install/windows/enterprise.win7.x86_64.tmpl.uefi
index 4eeb53c92..33a4325d9 100755
--- a/xCAT-server/share/xcat/install/windows/enterprise.win7.x86_64.tmpl.uefi
+++ b/xCAT-server/share/xcat/install/windows/enterprise.win7.x86_64.tmpl.uefi
@@ -87,7 +87,7 @@
         <component name="Microsoft-Windows-PnpCustomizationsNonWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
             <DriverPaths>
                 <PathAndCredentials wcm:action="add" wcm:keyValue="1">
-                    <Path>i:\drivers\win7\x86_64\Drivers</Path>
+                    <Path>i:\drivers\win7\x86_64</Path>
                 </PathAndCredentials>
             </DriverPaths>
         </component>
diff --git a/xCAT-server/share/xcat/install/windows/enterprise.win8.x86_64.tmpl b/xCAT-server/share/xcat/install/windows/enterprise.win8.x86_64.tmpl
index f7c071740..8c2ee4315 100755
--- a/xCAT-server/share/xcat/install/windows/enterprise.win8.x86_64.tmpl
+++ b/xCAT-server/share/xcat/install/windows/enterprise.win8.x86_64.tmpl
@@ -77,7 +77,7 @@
         <component name="Microsoft-Windows-PnpCustomizationsNonWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
             <DriverPaths>
                 <PathAndCredentials wcm:action="add" wcm:keyValue="1">
-                    <Path>i:\drivers\win7\x86_64\Drivers</Path>
+                    <Path>i:\drivers\win7\x86_64</Path>
                 </PathAndCredentials>
             </DriverPaths>
         </component>
diff --git a/xCAT-server/share/xcat/install/windows/enterprise.win8.x86_64.tmpl.uefi b/xCAT-server/share/xcat/install/windows/enterprise.win8.x86_64.tmpl.uefi
index 1c6c22908..c9c2b05fe 100755
--- a/xCAT-server/share/xcat/install/windows/enterprise.win8.x86_64.tmpl.uefi
+++ b/xCAT-server/share/xcat/install/windows/enterprise.win8.x86_64.tmpl.uefi
@@ -87,7 +87,7 @@
         <component name="Microsoft-Windows-PnpCustomizationsNonWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
             <DriverPaths>
                 <PathAndCredentials wcm:action="add" wcm:keyValue="1">
-                    <Path>i:\drivers\win7\x86_64\Drivers</Path>
+                    <Path>i:\drivers\win7\x86_64</Path>
                 </PathAndCredentials>
             </DriverPaths>
         </component>
diff --git a/xCAT-server/share/xcat/install/windows/enterprise_ad.win2k8r2.x86_64.tmpl b/xCAT-server/share/xcat/install/windows/enterprise_ad.win2k8r2.x86_64.tmpl
index 97d860045..181dbcc55 100644
--- a/xCAT-server/share/xcat/install/windows/enterprise_ad.win2k8r2.x86_64.tmpl
+++ b/xCAT-server/share/xcat/install/windows/enterprise_ad.win2k8r2.x86_64.tmpl
@@ -54,7 +54,7 @@
         <component name="Microsoft-Windows-PnpCustomizationsNonWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
             <DriverPaths>
                 <PathAndCredentials wcm:action="add" wcm:keyValue="1">
-                    <Path>I:\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch#\Drivers</Path>
+                    <Path>I:\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch#</Path>
                 </PathAndCredentials>
             </DriverPaths>
         </component>
diff --git a/xCAT-server/share/xcat/install/windows/enterprise_ad.win2k8r2.x86_64.tmpl.uefi b/xCAT-server/share/xcat/install/windows/enterprise_ad.win2k8r2.x86_64.tmpl.uefi
index 809f58fc4..3927a90d2 100644
--- a/xCAT-server/share/xcat/install/windows/enterprise_ad.win2k8r2.x86_64.tmpl.uefi
+++ b/xCAT-server/share/xcat/install/windows/enterprise_ad.win2k8r2.x86_64.tmpl.uefi
@@ -64,7 +64,7 @@
         <component name="Microsoft-Windows-PnpCustomizationsNonWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
             <DriverPaths>
                 <PathAndCredentials wcm:action="add" wcm:keyValue="1">
-                    <Path>I:\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch#\Drivers</Path>
+                    <Path>I:\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch#</Path>
                 </PathAndCredentials>
             </DriverPaths>
         </component>
diff --git a/xCAT-server/share/xcat/install/windows/standard.win2012.x86_64.tmpl b/xCAT-server/share/xcat/install/windows/standard.win2012.x86_64.tmpl
index e9ed7bf3c..0b6093e38 100644
--- a/xCAT-server/share/xcat/install/windows/standard.win2012.x86_64.tmpl
+++ b/xCAT-server/share/xcat/install/windows/standard.win2012.x86_64.tmpl
@@ -53,7 +53,7 @@
         <component name="Microsoft-Windows-PnpCustomizationsNonWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
             <DriverPaths>
                 <PathAndCredentials wcm:action="add" wcm:keyValue="1">
-                    <Path>I:\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch#\Drivers</Path>
+                    <Path>I:\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch#</Path>
                 </PathAndCredentials>
             </DriverPaths>
         </component>
diff --git a/xCAT-server/share/xcat/install/windows/standard.win2012.x86_64.tmpl.uefi b/xCAT-server/share/xcat/install/windows/standard.win2012.x86_64.tmpl.uefi
index 34e4737a8..14a3c3241 100644
--- a/xCAT-server/share/xcat/install/windows/standard.win2012.x86_64.tmpl.uefi
+++ b/xCAT-server/share/xcat/install/windows/standard.win2012.x86_64.tmpl.uefi
@@ -63,7 +63,7 @@
         <component name="Microsoft-Windows-PnpCustomizationsNonWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
             <DriverPaths>
                 <PathAndCredentials wcm:action="add" wcm:keyValue="1">
-                    <Path>I:\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch#\Drivers</Path>
+                    <Path>I:\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch#</Path>
                 </PathAndCredentials>
             </DriverPaths>
         </component>
diff --git a/xCAT-server/share/xcat/install/windows/standard.win2k8.x86_64.tmpl b/xCAT-server/share/xcat/install/windows/standard.win2k8.x86_64.tmpl
index 640e714a0..cd176a51b 100644
--- a/xCAT-server/share/xcat/install/windows/standard.win2k8.x86_64.tmpl
+++ b/xCAT-server/share/xcat/install/windows/standard.win2k8.x86_64.tmpl
@@ -58,7 +58,7 @@
         <component name="Microsoft-Windows-PnpCustomizationsNonWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
             <DriverPaths>
                 <PathAndCredentials wcm:action="add" wcm:keyValue="1">
-                    <Path>I:\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch#\Drivers</Path>
+                    <Path>I:\drivers\#TABLE:nodetype:$NODE:os#\#TABLE:nodetype:$NODE:arch#</Path>
                 </PathAndCredentials>
             </DriverPaths>
         </component>
diff --git a/xCAT-server/share/xcat/install/windows/ultimate.win7.x86_64.tmpl b/xCAT-server/share/xcat/install/windows/ultimate.win7.x86_64.tmpl
index 3d9d84ea6..1cf2c0aaf 100755
--- a/xCAT-server/share/xcat/install/windows/ultimate.win7.x86_64.tmpl
+++ b/xCAT-server/share/xcat/install/windows/ultimate.win7.x86_64.tmpl
@@ -81,7 +81,7 @@
         <component name="Microsoft-Windows-PnpCustomizationsNonWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
             <DriverPaths>
                 <PathAndCredentials wcm:action="add" wcm:keyValue="1">
-                    <Path>i:\drivers\win7\x86_64\Drivers</Path>
+                    <Path>i:\drivers\win7\x86_64</Path>
                 </PathAndCredentials>
             </DriverPaths>
         </component>