1) Make sure extra_driver_path is set on the xml files
2) Make sure the nw driver installer runs at the end of the
install for both the xml and .ini files
Signed-off-by: Lucas Meneghel Rodrigues <lmr@xxxxxxxxxx>
---
client/tests/kvm/unattended/win2003-32.sif | 14 +++++----
client/tests/kvm/unattended/win2003-64.sif | 14 +++++----
.../kvm/unattended/win2008-32-autounattend.xml | 30 +++++++++++++++----
.../kvm/unattended/win2008-64-autounattend.xml | 30 +++++++++++++++----
.../kvm/unattended/win2008-r2-autounattend.xml | 30 +++++++++++++++----
.../tests/kvm/unattended/win7-32-autounattend.xml | 32 +++++++++++++++----
.../tests/kvm/unattended/win7-64-autounattend.xml | 32 +++++++++++++++----
.../kvm/unattended/winvista-32-autounattend.xml | 30 +++++++++++++++----
.../kvm/unattended/winvista-64-autounattend.xml | 30 +++++++++++++++----
client/tests/kvm/unattended/winxp32.sif | 8 +++--
client/tests/kvm/unattended/winxp64.sif | 8 +++--
11 files changed, 196 insertions(+), 62 deletions(-)
diff --git a/client/tests/kvm/unattended/win2003-32.sif b/client/tests/kvm/unattended/win2003-32.sif
index f58b0b0..fab2cf5 100644
--- a/client/tests/kvm/unattended/win2003-32.sif
+++ b/client/tests/kvm/unattended/win2003-32.sif
@@ -10,6 +10,7 @@
UnattendSwitch = Yes
CrashDumpSetting = 1
DriverSigningPolicy = ignore
+ OemPnPDriversPath="KVM_TEST_NETWORK_DRIVER_PATH"
WaitForReboot = no
Repartition = yes
@@ -56,9 +57,10 @@
YResolution=768
[GuiRunOnce]
- Command0="cmd /c sc config TlntSvr start= auto"
- Command1="cmd /c netsh firewall set opmode disable"
- Command2="cmd /c net start telnet"
- Command3="cmd /c E:\setuprss.bat"
- Command4="cmd /c netsh interface ip set address local dhcp"
- Command5="cmd /c ping 10.0.2.2 -n 20 && A:\finish.exe"
+ Command0="cmd /c KVM_TEST_VIRTIO_NETWORK_INSTALLER"
+ Command1="cmd /c sc config TlntSvr start= auto"
+ Command2="cmd /c netsh firewall set opmode disable"
+ Command3="cmd /c net start telnet"
+ Command4="cmd /c E:\setuprss.bat"
+ Command5="cmd /c netsh interface ip set address local dhcp"
+ Command6="cmd /c ping 10.0.2.2 -n 20 && A:\finish.exe"
diff --git a/client/tests/kvm/unattended/win2003-64.sif b/client/tests/kvm/unattended/win2003-64.sif
index f58b0b0..fab2cf5 100644
--- a/client/tests/kvm/unattended/win2003-64.sif
+++ b/client/tests/kvm/unattended/win2003-64.sif
@@ -10,6 +10,7 @@
UnattendSwitch = Yes
CrashDumpSetting = 1
DriverSigningPolicy = ignore
+ OemPnPDriversPath="KVM_TEST_NETWORK_DRIVER_PATH"
WaitForReboot = no
Repartition = yes
@@ -56,9 +57,10 @@
YResolution=768
[GuiRunOnce]
- Command0="cmd /c sc config TlntSvr start= auto"
- Command1="cmd /c netsh firewall set opmode disable"
- Command2="cmd /c net start telnet"
- Command3="cmd /c E:\setuprss.bat"
- Command4="cmd /c netsh interface ip set address local dhcp"
- Command5="cmd /c ping 10.0.2.2 -n 20 && A:\finish.exe"
+ Command0="cmd /c KVM_TEST_VIRTIO_NETWORK_INSTALLER"
+ Command1="cmd /c sc config TlntSvr start= auto"
+ Command2="cmd /c netsh firewall set opmode disable"
+ Command3="cmd /c net start telnet"
+ Command4="cmd /c E:\setuprss.bat"
+ Command5="cmd /c netsh interface ip set address local dhcp"
+ Command6="cmd /c ping 10.0.2.2 -n 20 && A:\finish.exe"
diff --git a/client/tests/kvm/unattended/win2008-32-autounattend.xml b/client/tests/kvm/unattended/win2008-32-autounattend.xml
index 44a9fc4..89af07f 100644
--- a/client/tests/kvm/unattended/win2008-32-autounattend.xml
+++ b/client/tests/kvm/unattended/win2008-32-autounattend.xml
@@ -15,6 +15,20 @@
<UILanguageFallback>en-us</UILanguageFallback>
<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>
<component name="Microsoft-Windows-Setup"
processorArchitecture="x86" publicKeyToken="31bf3856ad364e35"
language="neutral" versionScope="nonSxS"
@@ -115,32 +129,36 @@
</AutoLogon>
<FirstLogonCommands>
<SynchronousCommand wcm:action="add">
+ <CommandLine>%WINDIR%\System32\cmd /c KVM_TEST_VIRTIO_NETWORK_INSTALLER"</CommandLine>
<Order>1</Order>
- <CommandLine>%WINDIR%\System32\cmd /c start /w pkgmgr /iu:"TelnetServer"</CommandLine>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
+ <CommandLine>%WINDIR%\System32\cmd /c start /w pkgmgr /iu:"TelnetServer"</CommandLine>
<Order>2</Order>
- <CommandLine>%WINDIR%\System32\cmd /c sc config TlntSvr start= auto</CommandLine>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
+ <CommandLine>%WINDIR%\System32\cmd /c sc config TlntSvr start= auto</CommandLine>
<Order>3</Order>
- <CommandLine>%WINDIR%\System32\cmd /c netsh firewall set opmode disable</CommandLine>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
+ <CommandLine>%WINDIR%\System32\cmd /c netsh firewall set opmode disable</CommandLine>
<Order>4</Order>
- <CommandLine>%WINDIR%\System32\cmd /c net start telnet</CommandLine>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
+ <CommandLine>%WINDIR%\System32\cmd /c net start telnet</CommandLine>
<Order>5</Order>
- <CommandLine>%WINDIR%\System32\cmd /c E:\setuprss.bat</CommandLine>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
+ <CommandLine>%WINDIR%\System32\cmd /c E:\setuprss.bat</CommandLine>
<Order>6</Order>
- <CommandLine>%WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" dhcp</CommandLine>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
+ <CommandLine>%WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" dhcp</CommandLine>
<Order>7</Order>
+ </SynchronousCommand>
+ <SynchronousCommand wcm:action="add">
<CommandLine>%WINDIR%\System32\cmd /c ping 10.0.2.2 -n 20 && A:\finish.exe</CommandLine>
+ <Order>8</Order>
</SynchronousCommand>
</FirstLogonCommands>
<OOBE>
diff --git a/client/tests/kvm/unattended/win2008-64-autounattend.xml b/client/tests/kvm/unattended/win2008-64-autounattend.xml
index ea0a524..98f5589 100644
--- a/client/tests/kvm/unattended/win2008-64-autounattend.xml
+++ b/client/tests/kvm/unattended/win2008-64-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"
@@ -124,32 +138,36 @@
</AutoLogon>
<FirstLogonCommands>
<SynchronousCommand wcm:action="add">
+ <CommandLine>%WINDIR%\System32\cmd /c KVM_TEST_VIRTIO_NETWORK_INSTALLER"</CommandLine>
<Order>1</Order>
- <CommandLine>%WINDIR%\System32\cmd /c start /w pkgmgr /iu:"TelnetServer"</CommandLine>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
+ <CommandLine>%WINDIR%\System32\cmd /c start /w pkgmgr /iu:"TelnetServer"</CommandLine>
<Order>2</Order>
- <CommandLine>%WINDIR%\System32\cmd /c sc config TlntSvr start= auto</CommandLine>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
+ <CommandLine>%WINDIR%\System32\cmd /c sc config TlntSvr start= auto</CommandLine>
<Order>3</Order>
- <CommandLine>%WINDIR%\System32\cmd /c netsh firewall set opmode disable</CommandLine>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
+ <CommandLine>%WINDIR%\System32\cmd /c netsh firewall set opmode disable</CommandLine>
<Order>4</Order>
- <CommandLine>%WINDIR%\System32\cmd /c net start telnet</CommandLine>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
+ <CommandLine>%WINDIR%\System32\cmd /c net start telnet</CommandLine>
<Order>5</Order>
- <CommandLine>%WINDIR%\System32\cmd /c E:\setuprss.bat</CommandLine>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
+ <CommandLine>%WINDIR%\System32\cmd /c E:\setuprss.bat</CommandLine>
<Order>6</Order>
- <CommandLine>%WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" dhcp</CommandLine>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
+ <CommandLine>%WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" dhcp</CommandLine>
<Order>7</Order>
+ </SynchronousCommand>
+ <SynchronousCommand wcm:action="add">
<CommandLine>%WINDIR%\System32\cmd /c ping 10.0.2.2 -n 20 && A:\finish.exe</CommandLine>
+ <Order>8</Order>
</SynchronousCommand>
</FirstLogonCommands>
<OOBE>
diff --git a/client/tests/kvm/unattended/win2008-r2-autounattend.xml b/client/tests/kvm/unattended/win2008-r2-autounattend.xml
index ea0a524..b624d10 100644
--- a/client/tests/kvm/unattended/win2008-r2-autounattend.xml
+++ b/client/tests/kvm/unattended/win2008-r2-autounattend.xml
@@ -100,6 +100,20 @@
<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"
@@ -124,32 +138,36 @@
</AutoLogon>
<FirstLogonCommands>
<SynchronousCommand wcm:action="add">
+ <CommandLine>%WINDIR%\System32\cmd /c KVM_TEST_VIRTIO_NETWORK_INSTALLER"</CommandLine>
<Order>1</Order>
- <CommandLine>%WINDIR%\System32\cmd /c start /w pkgmgr /iu:"TelnetServer"</CommandLine>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
+ <CommandLine>%WINDIR%\System32\cmd /c start /w pkgmgr /iu:"TelnetServer"</CommandLine>
<Order>2</Order>
- <CommandLine>%WINDIR%\System32\cmd /c sc config TlntSvr start= auto</CommandLine>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
+ <CommandLine>%WINDIR%\System32\cmd /c sc config TlntSvr start= auto</CommandLine>
<Order>3</Order>
- <CommandLine>%WINDIR%\System32\cmd /c netsh firewall set opmode disable</CommandLine>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
+ <CommandLine>%WINDIR%\System32\cmd /c netsh firewall set opmode disable</CommandLine>
<Order>4</Order>
- <CommandLine>%WINDIR%\System32\cmd /c net start telnet</CommandLine>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
+ <CommandLine>%WINDIR%\System32\cmd /c net start telnet</CommandLine>
<Order>5</Order>
- <CommandLine>%WINDIR%\System32\cmd /c E:\setuprss.bat</CommandLine>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
+ <CommandLine>%WINDIR%\System32\cmd /c E:\setuprss.bat</CommandLine>
<Order>6</Order>
- <CommandLine>%WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" dhcp</CommandLine>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
+ <CommandLine>%WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" dhcp</CommandLine>
<Order>7</Order>
+ </SynchronousCommand>
+ <SynchronousCommand wcm:action="add">
<CommandLine>%WINDIR%\System32\cmd /c ping 10.0.2.2 -n 20 && A:\finish.exe</CommandLine>
+ <Order>8</Order>
</SynchronousCommand>
</FirstLogonCommands>
<OOBE>
diff --git a/client/tests/kvm/unattended/win7-32-autounattend.xml b/client/tests/kvm/unattended/win7-32-autounattend.xml
index a577a91..a16cdd7 100644
--- a/client/tests/kvm/unattended/win7-32-autounattend.xml
+++ b/client/tests/kvm/unattended/win7-32-autounattend.xml
@@ -15,6 +15,20 @@
<UILanguageFallback>en-us</UILanguageFallback>
<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>
<component name="Microsoft-Windows-Setup"
processorArchitecture="x86" publicKeyToken="31bf3856ad364e35"
language="neutral" versionScope="nonSxS"
@@ -122,33 +136,37 @@
</AutoLogon>
<FirstLogonCommands>
<SynchronousCommand wcm:action="add">
- <CommandLine>%WINDIR%\System32\cmd /c start /w pkgmgr /iu:"TelnetServer"</CommandLine>
+ <CommandLine>%WINDIR%\System32\cmd /c KVM_TEST_VIRTIO_NETWORK_INSTALLER"</CommandLine>
<Order>1</Order>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
- <CommandLine>%WINDIR%\System32\cmd /c sc config TlntSvr start= auto</CommandLine>
+ <CommandLine>%WINDIR%\System32\cmd /c start /w pkgmgr /iu:"TelnetServer"</CommandLine>
<Order>2</Order>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
- <CommandLine>%WINDIR%\System32\cmd /c netsh firewall set opmode disable</CommandLine>
+ <CommandLine>%WINDIR%\System32\cmd /c sc config TlntSvr start= auto</CommandLine>
<Order>3</Order>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
- <CommandLine>%WINDIR%\System32\cmd /c net start telnet</CommandLine>
+ <CommandLine>%WINDIR%\System32\cmd /c netsh firewall set opmode disable</CommandLine>
<Order>4</Order>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
- <CommandLine>%WINDIR%\System32\cmd /c E:\setuprss.bat</CommandLine>
+ <CommandLine>%WINDIR%\System32\cmd /c net start telnet</CommandLine>
<Order>5</Order>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
- <CommandLine>%WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" dhcp</CommandLine>
+ <CommandLine>%WINDIR%\System32\cmd /c E:\setuprss.bat</CommandLine>
<Order>6</Order>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
- <CommandLine>%WINDIR%\System32\cmd /c ping 10.0.2.2 -n 20 && A:\finish.exe</CommandLine>
+ <CommandLine>%WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" dhcp</CommandLine>
<Order>7</Order>
</SynchronousCommand>
+ <SynchronousCommand wcm:action="add">
+ <CommandLine>%WINDIR%\System32\cmd /c ping 10.0.2.2 -n 20 && A:\finish.exe</CommandLine>
+ <Order>8</Order>
+ </SynchronousCommand>
</FirstLogonCommands>
</component>
</settings>
diff --git a/client/tests/kvm/unattended/win7-64-autounattend.xml b/client/tests/kvm/unattended/win7-64-autounattend.xml
index fec8017..65873f6 100644
--- a/client/tests/kvm/unattended/win7-64-autounattend.xml
+++ b/client/tests/kvm/unattended/win7-64-autounattend.xml
@@ -15,6 +15,20 @@
<UILanguageFallback>en-us</UILanguageFallback>
<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>
<component name="Microsoft-Windows-Setup"
processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35"
language="neutral" versionScope="nonSxS"
@@ -122,33 +136,37 @@
</AutoLogon>
<FirstLogonCommands>
<SynchronousCommand wcm:action="add">
- <CommandLine>%WINDIR%\System32\cmd /c start /w pkgmgr /iu:"TelnetServer"</CommandLine>
+ <CommandLine>%WINDIR%\System32\cmd /c KVM_TEST_VIRTIO_NETWORK_INSTALLER"</CommandLine>
<Order>1</Order>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
- <CommandLine>%WINDIR%\System32\cmd /c sc config TlntSvr start= auto</CommandLine>
+ <CommandLine>%WINDIR%\System32\cmd /c start /w pkgmgr /iu:"TelnetServer"</CommandLine>
<Order>2</Order>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
- <CommandLine>%WINDIR%\System32\cmd /c netsh firewall set opmode disable</CommandLine>
+ <CommandLine>%WINDIR%\System32\cmd /c sc config TlntSvr start= auto</CommandLine>
<Order>3</Order>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
- <CommandLine>%WINDIR%\System32\cmd /c net start telnet</CommandLine>
+ <CommandLine>%WINDIR%\System32\cmd /c netsh firewall set opmode disable</CommandLine>
<Order>4</Order>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
- <CommandLine>%WINDIR%\System32\cmd /c E:\setuprss.bat</CommandLine>
+ <CommandLine>%WINDIR%\System32\cmd /c net start telnet</CommandLine>
<Order>5</Order>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
- <CommandLine>%WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" dhcp</CommandLine>
+ <CommandLine>%WINDIR%\System32\cmd /c E:\setuprss.bat</CommandLine>
<Order>6</Order>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
- <CommandLine>%WINDIR%\System32\cmd /c ping 10.0.2.2 -n 20 && A:\finish.exe</CommandLine>
+ <CommandLine>%WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" dhcp</CommandLine>
<Order>7</Order>
</SynchronousCommand>
+ <SynchronousCommand wcm:action="add">
+ <CommandLine>%WINDIR%\System32\cmd /c ping 10.0.2.2 -n 20 && A:\finish.exe</CommandLine>
+ <Order>8</Order>
+ </SynchronousCommand>
</FirstLogonCommands>
</component>
</settings>
diff --git a/client/tests/kvm/unattended/winvista-32-autounattend.xml b/client/tests/kvm/unattended/winvista-32-autounattend.xml
index 7835a64..d4e8c5c 100644
--- a/client/tests/kvm/unattended/winvista-32-autounattend.xml
+++ b/client/tests/kvm/unattended/winvista-32-autounattend.xml
@@ -15,6 +15,20 @@
<UILanguageFallback>en-us</UILanguageFallback>
<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>
<component name="Microsoft-Windows-Setup"
processorArchitecture="x86" publicKeyToken="31bf3856ad364e35"
language="neutral" versionScope="nonSxS"
@@ -122,32 +136,36 @@
</AutoLogon>
<FirstLogonCommands>
<SynchronousCommand wcm:action="add">
+ <CommandLine>%WINDIR%\System32\cmd /c KVM_TEST_VIRTIO_NETWORK_INSTALLER"</CommandLine>
<Order>1</Order>
- <CommandLine>%WINDIR%\System32\cmd /c start /w pkgmgr /iu:"TelnetServer"</CommandLine>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
+ <CommandLine>%WINDIR%\System32\cmd /c start /w pkgmgr /iu:"TelnetServer"</CommandLine>
<Order>2</Order>
- <CommandLine>%WINDIR%\System32\cmd /c sc config TlntSvr start= auto</CommandLine>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
+ <CommandLine>%WINDIR%\System32\cmd /c sc config TlntSvr start= auto</CommandLine>
<Order>3</Order>
- <CommandLine>%WINDIR%\System32\cmd /c netsh firewall set opmode disable</CommandLine>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
+ <CommandLine>%WINDIR%\System32\cmd /c netsh firewall set opmode disable</CommandLine>
<Order>4</Order>
- <CommandLine>%WINDIR%\System32\cmd /c net start telnet</CommandLine>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
+ <CommandLine>%WINDIR%\System32\cmd /c net start telnet</CommandLine>
<Order>5</Order>
- <CommandLine>%WINDIR%\System32\cmd /c E:\setuprss.bat</CommandLine>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
+ <CommandLine>%WINDIR%\System32\cmd /c E:\setuprss.bat</CommandLine>
<Order>6</Order>
- <CommandLine>%WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" dhcp</CommandLine>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
+ <CommandLine>%WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" dhcp</CommandLine>
<Order>7</Order>
+ </SynchronousCommand>
+ <SynchronousCommand wcm:action="add">
<CommandLine>%WINDIR%\System32\cmd /c ping 10.0.2.2 -n 20 && A:\finish.exe</CommandLine>
+ <Order>8</Order>
</SynchronousCommand>
</FirstLogonCommands>
</component>
diff --git a/client/tests/kvm/unattended/winvista-64-autounattend.xml b/client/tests/kvm/unattended/winvista-64-autounattend.xml
index ad68bf9..16d4850 100644
--- a/client/tests/kvm/unattended/winvista-64-autounattend.xml
+++ b/client/tests/kvm/unattended/winvista-64-autounattend.xml
@@ -62,6 +62,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"
@@ -123,32 +137,36 @@
</OOBE>
<FirstLogonCommands>
<SynchronousCommand wcm:action="add">
+ <CommandLine>%WINDIR%\System32\cmd /c KVM_TEST_VIRTIO_NETWORK_INSTALLER"</CommandLine>
<Order>1</Order>
- <CommandLine>%WINDIR%\System32\cmd /c start /w pkgmgr /iu:"TelnetServer"</CommandLine>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
+ <CommandLine>%WINDIR%\System32\cmd /c start /w pkgmgr /iu:"TelnetServer"</CommandLine>
<Order>2</Order>
- <CommandLine>%WINDIR%\System32\cmd /c sc config TlntSvr start= auto</CommandLine>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
+ <CommandLine>%WINDIR%\System32\cmd /c sc config TlntSvr start= auto</CommandLine>
<Order>3</Order>
- <CommandLine>%WINDIR%\System32\cmd /c netsh firewall set opmode disable</CommandLine>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
+ <CommandLine>%WINDIR%\System32\cmd /c netsh firewall set opmode disable</CommandLine>
<Order>4</Order>
- <CommandLine>%WINDIR%\System32\cmd /c net start telnet</CommandLine>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
+ <CommandLine>%WINDIR%\System32\cmd /c net start telnet</CommandLine>
<Order>5</Order>
- <CommandLine>%WINDIR%\System32\cmd /c E:\setuprss.bat</CommandLine>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
+ <CommandLine>%WINDIR%\System32\cmd /c E:\setuprss.bat</CommandLine>
<Order>6</Order>
- <CommandLine>%WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" dhcp</CommandLine>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
+ <CommandLine>%WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" dhcp</CommandLine>
<Order>7</Order>
+ </SynchronousCommand>
+ <SynchronousCommand wcm:action="add">
<CommandLine>%WINDIR%\System32\cmd /c ping 10.0.2.2 -n 20 && A:\finish.exe</CommandLine>
+ <Order>8</Order>
</SynchronousCommand>
</FirstLogonCommands>
</component>
diff --git a/client/tests/kvm/unattended/winxp32.sif b/client/tests/kvm/unattended/winxp32.sif
index 7562846..b9a2ab6 100644
--- a/client/tests/kvm/unattended/winxp32.sif
+++ b/client/tests/kvm/unattended/winxp32.sif
@@ -13,6 +13,7 @@
UnattendSwitch=Yes
CrashDumpSetting=1
DriverSigningPolicy=ignore
+ OemPnPDriversPath="KVM_TEST_NETWORK_DRIVER_PATH"
WaitForReboot=no
[GuiUnattended]
@@ -68,6 +69,7 @@
YResolution=768
[GuiRunOnce]
- Command0="cmd /c E:\setuprss.bat"
- Command1="cmd /c netsh interface ip set address local dhcp"
- Command2="cmd /c ping 10.0.2.2 -n 20 && A:\finish.exe"
+ Command0="cmd /c KVM_TEST_VIRTIO_NETWORK_INSTALLER"
+ Command1="cmd /c E:\setuprss.bat"
+ Command2="cmd /c netsh interface ip set address local dhcp"
+ Command3="cmd /c ping 10.0.2.2 -n 20 && A:\finish.exe"
diff --git a/client/tests/kvm/unattended/winxp64.sif b/client/tests/kvm/unattended/winxp64.sif
index 7562846..b9a2ab6 100644
--- a/client/tests/kvm/unattended/winxp64.sif
+++ b/client/tests/kvm/unattended/winxp64.sif
@@ -13,6 +13,7 @@
UnattendSwitch=Yes
CrashDumpSetting=1
DriverSigningPolicy=ignore
+ OemPnPDriversPath="KVM_TEST_NETWORK_DRIVER_PATH"
WaitForReboot=no
[GuiUnattended]
@@ -68,6 +69,7 @@
YResolution=768
[GuiRunOnce]
- Command0="cmd /c E:\setuprss.bat"
- Command1="cmd /c netsh interface ip set address local dhcp"
- Command2="cmd /c ping 10.0.2.2 -n 20 && A:\finish.exe"
+ Command0="cmd /c KVM_TEST_VIRTIO_NETWORK_INSTALLER"
+ Command1="cmd /c E:\setuprss.bat"
+ Command2="cmd /c netsh interface ip set address local dhcp"
+ Command3="cmd /c ping 10.0.2.2 -n 20 && A:\finish.exe"
--
1.7.1.1
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
