Windows 2008 image is easy to go to startup repair screen, which make many of our cases fail. This patch will disable startup repair screen in win2008 which caused by shutdown failures.
Signed-off-by: Feng Yang <[email protected]> --- .../kvm/unattended/win2008-32-autounattend.xml | 10 +++++++--- .../kvm/unattended/win2008-64-autounattend.xml | 10 +++++++--- .../kvm/unattended/win2008-r2-autounattend.xml | 10 +++++++--- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/client/tests/kvm/unattended/win2008-32-autounattend.xml b/client/tests/kvm/unattended/win2008-32-autounattend.xml index 89af07f..7e8e160 100644 --- a/client/tests/kvm/unattended/win2008-32-autounattend.xml +++ b/client/tests/kvm/unattended/win2008-32-autounattend.xml @@ -149,16 +149,20 @@ <Order>5</Order> </SynchronousCommand> <SynchronousCommand wcm:action="add"> + <CommandLine>%WINDIR%\System32\cmd /c bcdedit /set {current} bootstatuspolicy ignoreallfailures</CommandLine> + <Order>6</Order> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> <CommandLine>%WINDIR%\System32\cmd /c E:\setuprss.bat</CommandLine> - <Order>6</Order> + <Order>7</Order> </SynchronousCommand> <SynchronousCommand wcm:action="add"> <CommandLine>%WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" dhcp</CommandLine> - <Order>7</Order> + <Order>8</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> + <Order>9</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 98f5589..fce6582 100644 --- a/client/tests/kvm/unattended/win2008-64-autounattend.xml +++ b/client/tests/kvm/unattended/win2008-64-autounattend.xml @@ -158,17 +158,21 @@ <Order>5</Order> </SynchronousCommand> <SynchronousCommand wcm:action="add"> - <CommandLine>%WINDIR%\System32\cmd /c E:\setuprss.bat</CommandLine> + <CommandLine>%WINDIR%\System32\cmd /c bcdedit /set {current} bootstatuspolicy ignoreallfailures</CommandLine> <Order>6</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>7</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>8</Order> </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%WINDIR%\System32\cmd /c ping 10.0.2.2 -n 20 && A:\finish.exe</CommandLine> + <Order>9</Order> + </SynchronousCommand> </FirstLogonCommands> <OOBE> <HideEULAPage>true</HideEULAPage> diff --git a/client/tests/kvm/unattended/win2008-r2-autounattend.xml b/client/tests/kvm/unattended/win2008-r2-autounattend.xml index b624d10..948e9a1 100644 --- a/client/tests/kvm/unattended/win2008-r2-autounattend.xml +++ b/client/tests/kvm/unattended/win2008-r2-autounattend.xml @@ -158,17 +158,21 @@ <Order>5</Order> </SynchronousCommand> <SynchronousCommand wcm:action="add"> - <CommandLine>%WINDIR%\System32\cmd /c E:\setuprss.bat</CommandLine> + <CommandLine>%WINDIR%\System32\cmd /c bcdedit /set {current} bootstatuspolicy ignoreallfailures</CommandLine> <Order>6</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>7</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>8</Order> </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%WINDIR%\System32\cmd /c ping 10.0.2.2 -n 20 && A:\finish.exe</CommandLine> + <Order>9</Order> + </SynchronousCommand> </FirstLogonCommands> <OOBE> <HideEULAPage>true</HideEULAPage> -- 1.6.5.2 _______________________________________________ Autotest mailing list [email protected] http://test.kernel.org/cgi-bin/mailman/listinfo/autotest
