From patchwork Mon Jan 18 02:36:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Meneghel Rodrigues X-Patchwork-Id: 73617 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o0I2atYw028129 for ; Mon, 18 Jan 2010 02:36:55 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752197Ab0ARCgw (ORCPT ); Sun, 17 Jan 2010 21:36:52 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752136Ab0ARCgw (ORCPT ); Sun, 17 Jan 2010 21:36:52 -0500 Received: from mx1.redhat.com ([209.132.183.28]:5821 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751976Ab0ARCgv (ORCPT ); Sun, 17 Jan 2010 21:36:51 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o0I2aoLf000738 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 17 Jan 2010 21:36:50 -0500 Received: from localhost.localdomain (vpn-8-173.rdu.redhat.com [10.11.8.173]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o0I2aiQw016266; Sun, 17 Jan 2010 21:36:48 -0500 From: Lucas Meneghel Rodrigues To: autotest@test.kernel.org Cc: kvm@vger.kernel.org, Lucas Meneghel Rodrigues Subject: [PATCH 2/2] Fix windows unattended setup for rss.exe Date: Mon, 18 Jan 2010 00:36:42 -0200 Message-Id: <1263782202-8086-2-git-send-email-lmr@redhat.com> In-Reply-To: <1263782202-8086-1-git-send-email-lmr@redhat.com> References: <1263782202-8086-1-git-send-email-lmr@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample index c42386d..b1b1539 100644 --- a/client/tests/kvm/tests_base.cfg.sample +++ b/client/tests/kvm/tests_base.cfg.sample @@ -602,6 +602,7 @@ variants: unattended_install: timeout = 7200 finish_program = deps/finish.exe + cdrom_extra = windows/winutils.iso migrate: migration_test_command = ver && vol migration_bg_command = start ping -t localhost diff --git a/client/tests/kvm/unattended/win2003-32.sif b/client/tests/kvm/unattended/win2003-32.sif index 374d4c4..5b9bf0e 100644 --- a/client/tests/kvm/unattended/win2003-32.sif +++ b/client/tests/kvm/unattended/win2003-32.sif @@ -14,7 +14,7 @@ WaitForReboot = no Repartition = yes [GuiUnattended] -AdminPassword = "123456" +AdminPassword = "1q2w3eP" AutoLogon = Yes AutoLogonCount = 5 OEMSkipRegional = 1 @@ -34,7 +34,7 @@ AutoUsers=15 [Identification] DoOldStyleDomainJoin = YES DomainAdmin="Administrator" - DomainAdminPassword="123456" + DomainAdminPassword="1q2w3eP" JoinWorkgroup=WORKGROUP JoinDomain="qe.redhat.com" @@ -56,7 +56,8 @@ Mode = 0 local="Local Area Connection" [GuiRunOnce] -Command0="sc config TlntSvr start= auto" -Command1="netsh firewall set opmode disable" -Command2="net start telnet" -Command3="cmd /c netsh interface ip set address local static 10.0.2.15 255.255.255.0 10.0.2.2 1 && ping 10.0.2.2 -n 20 && A:\finish.exe 10.0.2.2" +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 static 10.0.2.15 255.255.255.0 10.0.2.2 1 && ping 10.0.2.2 -n 20 && A:\finish.exe 10.0.2.2" diff --git a/client/tests/kvm/unattended/win2003-64.sif b/client/tests/kvm/unattended/win2003-64.sif index fe468cb..aca24fe 100644 --- a/client/tests/kvm/unattended/win2003-64.sif +++ b/client/tests/kvm/unattended/win2003-64.sif @@ -58,4 +58,5 @@ local="Local Area Connection" 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 netsh interface ip set address local static 10.0.2.15 255.255.255.0 10.0.2.2 1 && ping 10.0.2.2 -n 20 && A:\finish.exe 10.0.2.2" +Command3="cmd /c E:\setuprss.bat" +Command4="cmd /c netsh interface ip set address local static 10.0.2.15 255.255.255.0 10.0.2.2 1 && ping 10.0.2.2 -n 20 && A:\finish.exe 10.0.2.2" diff --git a/client/tests/kvm/unattended/win2008-32-autounattend.xml b/client/tests/kvm/unattended/win2008-32-autounattend.xml index b8f3a56..0498e99 100644 --- a/client/tests/kvm/unattended/win2008-32-autounattend.xml +++ b/client/tests/kvm/unattended/win2008-32-autounattend.xml @@ -113,6 +113,10 @@ 5 + %WINDIR%\System32\cmd /c E:\setuprss.bat + + + 6 %WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" static 10.0.2.15 255.255.255.0 10.0.2.2 1 && ping 10.0.2.2 -n 20 && A:\finish.exe 10.0.2.2 diff --git a/client/tests/kvm/unattended/win2008-64-autounattend.xml b/client/tests/kvm/unattended/win2008-64-autounattend.xml index 345165a..77c4999 100644 --- a/client/tests/kvm/unattended/win2008-64-autounattend.xml +++ b/client/tests/kvm/unattended/win2008-64-autounattend.xml @@ -120,14 +120,18 @@ 5 + %WINDIR%\System32\cmd /c E:\setuprss.bat + + + 6 %WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" static 10.0.2.15 255.255.255.0 10.0.2.2 1 && ping 10.0.2.2 -n 20 && A:\finish.exe 10.0.2.2 true - Work - 1 - true + Work + 1 + true true diff --git a/client/tests/kvm/unattended/win2008-r2-autounattend.xml b/client/tests/kvm/unattended/win2008-r2-autounattend.xml index 345165a..77c4999 100644 --- a/client/tests/kvm/unattended/win2008-r2-autounattend.xml +++ b/client/tests/kvm/unattended/win2008-r2-autounattend.xml @@ -120,14 +120,18 @@ 5 + %WINDIR%\System32\cmd /c E:\setuprss.bat + + + 6 %WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" static 10.0.2.15 255.255.255.0 10.0.2.2 1 && ping 10.0.2.2 -n 20 && A:\finish.exe 10.0.2.2 true - Work - 1 - true + Work + 1 + true true diff --git a/client/tests/kvm/unattended/win7-32-autounattend.xml b/client/tests/kvm/unattended/win7-32-autounattend.xml index faf588a..86a0ae7 100644 --- a/client/tests/kvm/unattended/win7-32-autounattend.xml +++ b/client/tests/kvm/unattended/win7-32-autounattend.xml @@ -58,7 +58,7 @@ true redhatqe - redhat + redhat false true @@ -113,6 +113,10 @@ 5 + %WINDIR%\System32\cmd /c E:\setuprss.bat + + + 6 %WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" static 10.0.2.15 255.255.255.0 10.0.2.2 1 && ping 10.0.2.2 -n 20 && A:\finish.exe 10.0.2.2 @@ -129,8 +133,8 @@ - cgBlAGQAaABhAHQAUABhAHMAcwB3AG8AcgBkAA== - false</PlainText> + <Value>1q2w3eP</Value> + <PlainText>true</PlainText> </Password> <Username>Administrator</Username> <LogonCount>5</LogonCount> diff --git a/client/tests/kvm/unattended/win7-64-autounattend.xml b/client/tests/kvm/unattended/win7-64-autounattend.xml index 345165a..77c4999 100644 --- a/client/tests/kvm/unattended/win7-64-autounattend.xml +++ b/client/tests/kvm/unattended/win7-64-autounattend.xml @@ -120,14 +120,18 @@ </SynchronousCommand> <SynchronousCommand wcm:action="add"> <Order>5</Order> + <CommandLine>%WINDIR%\System32\cmd /c E:\setuprss.bat</CommandLine> + </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <Order>6</Order> <CommandLine>%WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" static 10.0.2.15 255.255.255.0 10.0.2.2 1 &#38;&#38; ping 10.0.2.2 -n 20 &#38;&#38; A:\finish.exe 10.0.2.2</CommandLine> </SynchronousCommand> </FirstLogonCommands> <OOBE> <HideEULAPage>true</HideEULAPage> - <NetworkLocation>Work</NetworkLocation> - <ProtectYourPC>1</ProtectYourPC> - <SkipUserOOBE>true</SkipUserOOBE> + <NetworkLocation>Work</NetworkLocation> + <ProtectYourPC>1</ProtectYourPC> + <SkipUserOOBE>true</SkipUserOOBE> <SkipMachineOOBE>true</SkipMachineOOBE> </OOBE> </component> diff --git a/client/tests/kvm/unattended/winvista-32-autounattend.xml b/client/tests/kvm/unattended/winvista-32-autounattend.xml index 054926d..072385d 100644 --- a/client/tests/kvm/unattended/winvista-32-autounattend.xml +++ b/client/tests/kvm/unattended/winvista-32-autounattend.xml @@ -88,20 +88,20 @@ <UserAccounts> <AdministratorPassword> <!-- <Value>UABAAHMAcwB3ADAAcgBkAEEAZABtAGkAbgBpAHMAdAByAGEAdABvAHIAUABhAHMAcwB3AG8AcgBkAA==</Value> --> - <Value>123456</Value> + <Value>1q2w3eP</Value> <PlainText>true</PlainText> </AdministratorPassword> </UserAccounts> <OOBE> <HideEULAPage>true</HideEULAPage> - <NetworkLocation>Work</NetworkLocation> - <ProtectYourPC>1</ProtectYourPC> - <SkipUserOOBE>true</SkipUserOOBE> + <NetworkLocation>Work</NetworkLocation> + <ProtectYourPC>1</ProtectYourPC> + <SkipUserOOBE>true</SkipUserOOBE> <SkipMachineOOBE>true</SkipMachineOOBE> </OOBE> <AutoLogon> <Password> - <Value>123456</Value> + <Value>1q2w3eP</Value> <PlainText>true</PlainText> </Password> <Enabled>true</Enabled> @@ -126,9 +126,13 @@ <Order>4</Order> </SynchronousCommand> <SynchronousCommand wcm:action="add"> - <CommandLine>%WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" static 10.0.2.15 255.255.255.0 10.0.2.2 1 &#38;&#38; ping 10.0.2.2 -n 20 &#38;&#38; A:\finish.exe 10.0.2.2</CommandLine> + <CommandLine>%WINDIR%\System32\cmd /c E:\setuprss.bat</CommandLine> <Order>5</Order> </SynchronousCommand> + <SynchronousCommand wcm:action="add"> + <CommandLine>%WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" static 10.0.2.15 255.255.255.0 10.0.2.2 1 &#38;&#38; ping 10.0.2.2 -n 20 &#38;&#38; A:\finish.exe 10.0.2.2</CommandLine> + <Order>6</Order> + </SynchronousCommand> </FirstLogonCommands> </component> </settings> diff --git a/client/tests/kvm/unattended/winvista-64-autounattend.xml b/client/tests/kvm/unattended/winvista-64-autounattend.xml index bb811dc..7396061 100644 --- a/client/tests/kvm/unattended/winvista-64-autounattend.xml +++ b/client/tests/kvm/unattended/winvista-64-autounattend.xml @@ -82,7 +82,7 @@ <UserAccounts> <AdministratorPassword> <!-- <Value>UABAAHMAcwB3ADAAcgBkAEEAZABtAGkAbgBpAHMAdAByAGEAdABvAHIAUABhAHMAcwB3AG8AcgBkAA==</Value> --> - <Value>123456</Value> + <Value>1q2w3eP</Value> <PlainText>true</PlainText> </AdministratorPassword> </UserAccounts> @@ -92,7 +92,7 @@ <Username>Administrator</Username> <Password> <!-- <Value>UABAAHMAcwB3ADAAcgBkAFAAYQBzAHMAdwBvAHIAZAA=</Value> --> - <Value>123456</Value> + <Value>1q2w3eP</Value> <PlainText>true</PlainText> </Password> </AutoLogon> diff --git a/client/tests/kvm/unattended/winxp32.sif b/client/tests/kvm/unattended/winxp32.sif index 153f499..3e59e6d 100644 --- a/client/tests/kvm/unattended/winxp32.sif +++ b/client/tests/kvm/unattended/winxp32.sif @@ -16,7 +16,7 @@ WaitForReboot=no [GuiUnattended] - AdminPassword="123456" + AdminPassword="1q2w3eP" EncryptedAdminPassword=NO TimeZone=85 OemSkipWelcome=1 @@ -64,7 +64,8 @@ BrandIEUsingUnattended=Yes [GuiRunOnce] - Command0="cmd /c A:\finish.exe 10.0.2.2" + Command0="cmd /c E:\setuprss.bat" + Command1="cmd /c A:\finish.exe 10.0.2.2" [Display] Xresolution=1024