From patchwork Tue Jan 26 17:43:35 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: 75190 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 o0QHhmpK011334 for ; Tue, 26 Jan 2010 17:43:49 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754175Ab0AZRnm (ORCPT ); Tue, 26 Jan 2010 12:43:42 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754208Ab0AZRnl (ORCPT ); Tue, 26 Jan 2010 12:43:41 -0500 Received: from mx1.redhat.com ([209.132.183.28]:8859 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753745Ab0AZRnl (ORCPT ); Tue, 26 Jan 2010 12:43:41 -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 o0QHhdse001313 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 26 Jan 2010 12:43:40 -0500 Received: from localhost.localdomain (vpn-11-68.rdu.redhat.com [10.11.11.68]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o0QHhbAf014325; Tue, 26 Jan 2010 12:43:38 -0500 From: Lucas Meneghel Rodrigues To: autotest@test.kernel.org Cc: kvm@vger.kernel.org, Lucas Meneghel Rodrigues Subject: [PATCH] KVM test: Fix setup stage of windows hosts Date: Tue, 26 Jan 2010 15:43:35 -0200 Message-Id: <1264527815-8494-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/unattended/win2003-32.sif b/client/tests/kvm/unattended/win2003-32.sif index 5b9bf0e..901f435 100644 --- a/client/tests/kvm/unattended/win2003-32.sif +++ b/client/tests/kvm/unattended/win2003-32.sif @@ -60,4 +60,4 @@ 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" +Command4="cmd /c netsh interface ip set address local dhcp && 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 aca24fe..9f09033 100644 --- a/client/tests/kvm/unattended/win2003-64.sif +++ b/client/tests/kvm/unattended/win2003-64.sif @@ -59,4 +59,4 @@ 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" +Command4="cmd /c netsh interface ip set address local dhcp && 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 0498e99..d8f7654 100644 --- a/client/tests/kvm/unattended/win2008-32-autounattend.xml +++ b/client/tests/kvm/unattended/win2008-32-autounattend.xml @@ -117,7 +117,7 @@ 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 + %WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" dhcp && 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 77c4999..4202b93 100644 --- a/client/tests/kvm/unattended/win2008-64-autounattend.xml +++ b/client/tests/kvm/unattended/win2008-64-autounattend.xml @@ -124,7 +124,7 @@ 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 + %WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" dhcp && ping 10.0.2.2 -n 20 && A:\finish.exe 10.0.2.2 diff --git a/client/tests/kvm/unattended/win2008-r2-autounattend.xml b/client/tests/kvm/unattended/win2008-r2-autounattend.xml index 77c4999..4202b93 100644 --- a/client/tests/kvm/unattended/win2008-r2-autounattend.xml +++ b/client/tests/kvm/unattended/win2008-r2-autounattend.xml @@ -124,7 +124,7 @@ 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 + %WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" dhcp && ping 10.0.2.2 -n 20 && A:\finish.exe 10.0.2.2 diff --git a/client/tests/kvm/unattended/win7-32-autounattend.xml b/client/tests/kvm/unattended/win7-32-autounattend.xml index 86a0ae7..46e7064 100644 --- a/client/tests/kvm/unattended/win7-32-autounattend.xml +++ b/client/tests/kvm/unattended/win7-32-autounattend.xml @@ -117,7 +117,7 @@ 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 + %WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" dhcp && ping 10.0.2.2 -n 20 && A:\finish.exe 10.0.2.2 diff --git a/client/tests/kvm/unattended/win7-64-autounattend.xml b/client/tests/kvm/unattended/win7-64-autounattend.xml index 77c4999..4202b93 100644 --- a/client/tests/kvm/unattended/win7-64-autounattend.xml +++ b/client/tests/kvm/unattended/win7-64-autounattend.xml @@ -124,7 +124,7 @@ 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 + %WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" dhcp && ping 10.0.2.2 -n 20 && A:\finish.exe 10.0.2.2 diff --git a/client/tests/kvm/unattended/winvista-32-autounattend.xml b/client/tests/kvm/unattended/winvista-32-autounattend.xml index 072385d..5d2b038 100644 --- a/client/tests/kvm/unattended/winvista-32-autounattend.xml +++ b/client/tests/kvm/unattended/winvista-32-autounattend.xml @@ -130,7 +130,7 @@ 5 - %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 + %WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" dhcp && ping 10.0.2.2 -n 20 && A:\finish.exe 10.0.2.2 6 diff --git a/client/tests/kvm/unattended/winvista-64-autounattend.xml b/client/tests/kvm/unattended/winvista-64-autounattend.xml index 7396061..812db40 100644 --- a/client/tests/kvm/unattended/winvista-64-autounattend.xml +++ b/client/tests/kvm/unattended/winvista-64-autounattend.xml @@ -121,7 +121,7 @@ 4 - %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 + %WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" dhcp && ping 10.0.2.2 -n 20 && A:\finish.exe 10.0.2.2 5 diff --git a/client/tests/kvm/unattended/winxp32.sif b/client/tests/kvm/unattended/winxp32.sif index 3e59e6d..dc4ef29 100644 --- a/client/tests/kvm/unattended/winxp32.sif +++ b/client/tests/kvm/unattended/winxp32.sif @@ -65,7 +65,7 @@ [GuiRunOnce] Command0="cmd /c E:\setuprss.bat" - Command1="cmd /c A:\finish.exe 10.0.2.2" + Command1="cmd /c netsh interface ip set address local dhcp && ping 10.0.2.2 -n 20 && A:\finish.exe 10.0.2.2" [Display] Xresolution=1024