client/tests/kvm/unattended/win7-32-autounattend.xml - Issue 6246035: Merge remote branch 'cros/upstream' into master

Side by Side Diff: client/tests/kvm/unattended/win7-32-autounattend.xml

Issue 6246035: Merge remote branch 'cros/upstream' into master (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/autotest.git@master

Patch Set: patch Created 9 years, 10 months 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 unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 <?xml version="1.0" encoding="utf-8"?>	1 <?xml version="1.0" encoding="utf-8"?>

2 <unattend xmlns="urn:schemas-microsoft-com:unattend">	2 <unattend xmlns="urn:schemas-microsoft-com:unattend">

3 <settings pass="windowsPE">	3 <settings pass="windowsPE">

4 <component name="Microsoft-Windows-International-Core-WinPE"	4 <component name="Microsoft-Windows-International-Core-WinPE"

5 processorArchitecture="x86" publicKeyToken="31bf3856ad36 4e35"	5 processorArchitecture="x86" publicKeyToken="31bf3856ad36 4e35"

6 language="neutral" versionScope="nonSxS"	6 language="neutral" versionScope="nonSxS"

7 xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/S tate"	7 xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/S tate"

8 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">	8 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

9 <SetupUILanguage>	9 <SetupUILanguage>

10 <UILanguage>en-us</UILanguage>	10 <UILanguage>en-us</UILanguage>

(...skipping 138 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
149 </SynchronousCommand>	149 </SynchronousCommand>

150 <SynchronousCommand wcm:action="add">	150 <SynchronousCommand wcm:action="add">

151 <CommandLine>%WINDIR%\System32\cmd /c ne tsh firewall set opmode disable</CommandLine>	151 <CommandLine>%WINDIR%\System32\cmd /c ne tsh firewall set opmode disable</CommandLine>

152 <Order>4</Order>	152 <Order>4</Order>

153 </SynchronousCommand>	153 </SynchronousCommand>

154 <SynchronousCommand wcm:action="add">	154 <SynchronousCommand wcm:action="add">

155 <CommandLine>%WINDIR%\System32\cmd /c ne t start telnet</CommandLine>	155 <CommandLine>%WINDIR%\System32\cmd /c ne t start telnet</CommandLine>

156 <Order>5</Order>	156 <Order>5</Order>

157 </SynchronousCommand>	157 </SynchronousCommand>

158 <SynchronousCommand wcm:action="add">	158 <SynchronousCommand wcm:action="add">

159 <<<<<<< HEAD

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

161 <Order>6</Order>

162 </SynchronousCommand>

163 <SynchronousCommand wcm:action="add">

164 <CommandLine>%WINDIR%\System32\cmd /c ne tsh interface ip set address "Local Area Connection" dhcp</CommandLine>

165 <Order>7</Order>

166 </SynchronousCommand>

167 <SynchronousCommand wcm:action="add">

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

169 <Order>8</Order>

170 </SynchronousCommand>

171 =======

172 <CommandLine>%WINDIR%\System32\cmd /c bc dedit /set {current} bootstatuspolicy ignoreallfailures</CommandLine>	159 <CommandLine>%WINDIR%\System32\cmd /c bc dedit /set {current} bootstatuspolicy ignoreallfailures</CommandLine>

173 <Order>6</Order>	160 <Order>6</Order>

174 </SynchronousCommand>	161 </SynchronousCommand>

175 <SynchronousCommand wcm:action="add">	162 <SynchronousCommand wcm:action="add">

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

177 <Order>7</Order>	164 <Order>7</Order>

178 </SynchronousCommand>	165 </SynchronousCommand>

179 <SynchronousCommand wcm:action="add">	166 <SynchronousCommand wcm:action="add">

180 <CommandLine>%WINDIR%\System32\cmd /c ne tsh interface ip set address "Local Area Connection" dhcp</CommandLine>	167 <CommandLine>%WINDIR%\System32\cmd /c ne tsh interface ip set address "Local Area Connection" dhcp</CommandLine>

181 <Order>8</Order>	168 <Order>8</Order>

182 </SynchronousCommand>	169 </SynchronousCommand>

183 <SynchronousCommand wcm:action="add">	170 <SynchronousCommand wcm:action="add">

184 » » » » » <CommandLine>%WINDIR%\System32\cmd /c pi ng 10.0.2.2 -n 20 && A:\finish.exe</CommandLine>	171 » » » » » <CommandLine>%WINDIR%\System32\cmd /c A: \finish.exe</CommandLine>

185 <Order>9</Order>	172 <Order>9</Order>

186 </SynchronousCommand>	173 </SynchronousCommand>

187 >>>>>>> cros/upstream

188 </FirstLogonCommands>	174 </FirstLogonCommands>

189 </component>	175 </component>

190 </settings>	176 </settings>

191 <cpi:offlineImage cpi:source="wim:c:/install.wim#Windows Longhorn SERVER STANDARD"	177 <cpi:offlineImage cpi:source="wim:c:/install.wim#Windows Longhorn SERVER STANDARD"

192 xmlns:cpi="urn:schemas-microsoft-com:cpi" />	178 xmlns:cpi="urn:schemas-microsoft-com:cpi" />

193 </unattend>	179 </unattend>

OLD	NEW

« cli/job.py ('K') | « client/tests/kvm/unattended/win2008-r2-autounattend.xml ('k') | client/tests/kvm/unattended/win7-64-autounattend.xml » ('j') | no next file with comments »