Correct the processorArchitecture (x86) in win2008-32-autounattend.xml and
win7-32-autounattend.xml
Move virtio config from 'windowsPE' to 'specialize' part in
win2008-r2-autounattend.xml. Otherwise, guest could not identify block device

Signed-off-by: Amos Kong <[email protected]>
---
 0 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/client/tests/kvm/unattended/win2008-32-autounattend.xml 
b/client/tests/kvm/unattended/win2008-32-autounattend.xml
index 89af07f..a8fc9c5 100644
--- a/client/tests/kvm/unattended/win2008-32-autounattend.xml
+++ b/client/tests/kvm/unattended/win2008-32-autounattend.xml
@@ -16,7 +16,7 @@
                        <UserLocale>en-us</UserLocale>
                </component>
                <component name="Microsoft-Windows-PnpCustomizationsWinPE"
-                       processorArchitecture="amd64" 
publicKeyToken="31bf3856ad364e35"
+                       processorArchitecture="x86" 
publicKeyToken="31bf3856ad364e35"
                        language="neutral" versionScope="nonSxS"
                        
xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State";
                        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
diff --git a/client/tests/kvm/unattended/win2008-r2-autounattend.xml 
b/client/tests/kvm/unattended/win2008-r2-autounattend.xml
index b624d10..98f5589 100644
--- a/client/tests/kvm/unattended/win2008-r2-autounattend.xml
+++ b/client/tests/kvm/unattended/win2008-r2-autounattend.xml
@@ -70,6 +70,20 @@
                        <UserLocale>en-us</UserLocale>
                        <UILanguageFallback>en-us</UILanguageFallback>
                </component>
+               <component name="Microsoft-Windows-PnpCustomizationsWinPE"
+                       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:keyValue="1" 
wcm:action="add">
+                                       
<Path>KVM_TEST_STORAGE_DRIVER_PATH</Path>
+                               </PathAndCredentials>
+                               <PathAndCredentials wcm:keyValue="2" 
wcm:action="add">
+                                       
<Path>KVM_TEST_NETWORK_DRIVER_PATH</Path>
+                               </PathAndCredentials>
+                       </DriverPaths>
+               </component>
        </settings>
        <settings pass="specialize">
                <component name="Microsoft-Windows-Deployment"
@@ -100,20 +114,6 @@
                        <UILanguage>en-US</UILanguage>
                        <UserLocale>en-US</UserLocale>
                </component>
-               <component name="Microsoft-Windows-PnpCustomizationsWinPE"
-                       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:keyValue="1" 
wcm:action="add">
-                                       
<Path>KVM_TEST_STORAGE_DRIVER_PATH</Path>
-                               </PathAndCredentials>
-                               <PathAndCredentials wcm:keyValue="2" 
wcm:action="add">
-                                       
<Path>KVM_TEST_NETWORK_DRIVER_PATH</Path>
-                               </PathAndCredentials>
-                       </DriverPaths>
-               </component>
        </settings>
        <settings pass="oobeSystem">
                <component name="Microsoft-Windows-Shell-Setup"
diff --git a/client/tests/kvm/unattended/win7-32-autounattend.xml 
b/client/tests/kvm/unattended/win7-32-autounattend.xml
index 8efef2c..7a853e9 100644
--- a/client/tests/kvm/unattended/win7-32-autounattend.xml
+++ b/client/tests/kvm/unattended/win7-32-autounattend.xml
@@ -16,7 +16,7 @@
                        <UserLocale>en-us</UserLocale>
                </component>
                <component name="Microsoft-Windows-PnpCustomizationsWinPE"
-                       processorArchitecture="amd64" 
publicKeyToken="31bf3856ad364e35"
+                       processorArchitecture="x86" 
publicKeyToken="31bf3856ad364e35"
                        language="neutral" versionScope="nonSxS"
                        
xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State";
                        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>

_______________________________________________
Autotest mailing list
[email protected]
http://test.kernel.org/cgi-bin/mailman/listinfo/autotest

Reply via email to