client/tests/kvm/unattended/win2008-32-autounattend.xml - Issue 4823005: Merge remote branch 'cros/upstream' into tempbranch

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: client/tests/kvm/unattended/win2008-32-autounattend.xml

Issue 4823005: Merge remote branch 'cros/upstream' into tempbranch (Closed) Base URL: http://git.chromium.org/git/autotest.git@master

Patch Set: Created 10 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« client/bin/kernel.py ('K') | « client/tests/kvm/tests_base.cfg.sample ('k') | client/tests/kvm/unattended/win2008-64-autounattend.xml » ('j') | frontend/migrations/064_add_jobs_and_tests_time_indices.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: client/tests/kvm/unattended/win2008-32-autounattend.xml

diff --git a/client/tests/kvm/unattended/win2008-32-autounattend.xml b/client/tests/kvm/unattended/win2008-32-autounattend.xml

index 89af07f10ed7b1691b5e027c2b867a84cf34f73e..352cb7356628c786d69827b27e40292a563e3011 100644

--- a/client/tests/kvm/unattended/win2008-32-autounattend.xml

+++ b/client/tests/kvm/unattended/win2008-32-autounattend.xml

@@ -16,7 +16,7 @@

</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">

@@ -147,6 +147,7 @@

<CommandLine>%WINDIR%\System32\cmd /c net start telnet</CommandLine>

+<<<<<<< HEAD

</SynchronousCommand>

<CommandLine>%WINDIR%\System32\cmd /c E:\setuprss.bat</CommandLine>

@@ -159,6 +160,24 @@

<CommandLine>%WINDIR%\System32\cmd /c ping 10.0.2.2 -n 20 && A:\finish.exe</CommandLine>

+=======

+ </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>7</Order>

+ </SynchronousCommand>

+ <SynchronousCommand wcm:action="add">

+ <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>

+>>>>>>> cros/upstream

</SynchronousCommand>

</FirstLogonCommands>

<OOBE>