From patchwork Mon Jun 28 14:54:18 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Goldish X-Patchwork-Id: 108383 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o5SEsrFC009486 for ; Mon, 28 Jun 2010 14:54:54 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754905Ab0F1Oyv (ORCPT ); Mon, 28 Jun 2010 10:54:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:63951 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753493Ab0F1Oyu (ORCPT ); Mon, 28 Jun 2010 10:54:50 -0400 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 o5SEsktG005379 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 28 Jun 2010 10:54:46 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5SEsjDp000893; Mon, 28 Jun 2010 10:54:45 -0400 Received: from localhost.localdomain (dhcp-1-188.tlv.redhat.com [10.35.1.188]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id o5SEsfBu009924; Mon, 28 Jun 2010 10:54:42 -0400 From: Michael Goldish To: autotest@test.kernel.org, kvm@vger.kernel.org Cc: Michael Goldish Subject: [KVM-AUTOTEST PATCH] KVM test: Windows unattended_install: don't start the telnet service at startup Date: Mon, 28 Jun 2010 17:54:18 +0300 Message-Id: <1277736858-7654-1-git-send-email-mgoldish@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 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Mon, 28 Jun 2010 14:55:18 +0000 (UTC) diff --git a/client/tests/kvm/unattended/win2003-32.sif b/client/tests/kvm/unattended/win2003-32.sif index f58b0b0..d1e8495 100644 --- a/client/tests/kvm/unattended/win2003-32.sif +++ b/client/tests/kvm/unattended/win2003-32.sif @@ -56,9 +56,7 @@ YResolution=768 [GuiRunOnce] - 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 dhcp" - Command5="cmd /c ping 10.0.2.2 -n 20 && A:\finish.exe" + Command0="cmd /c netsh firewall set opmode disable" + Command1="cmd /c E:\setuprss.bat" + Command2="cmd /c netsh interface ip set address local dhcp" + Command3="cmd /c ping 10.0.2.2 -n 20 && A:\finish.exe" diff --git a/client/tests/kvm/unattended/win2003-64.sif b/client/tests/kvm/unattended/win2003-64.sif index f58b0b0..d1e8495 100644 --- a/client/tests/kvm/unattended/win2003-64.sif +++ b/client/tests/kvm/unattended/win2003-64.sif @@ -56,9 +56,7 @@ YResolution=768 [GuiRunOnce] - 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 dhcp" - Command5="cmd /c ping 10.0.2.2 -n 20 && A:\finish.exe" + Command0="cmd /c netsh firewall set opmode disable" + Command1="cmd /c E:\setuprss.bat" + Command2="cmd /c netsh interface ip set address local dhcp" + Command3="cmd /c ping 10.0.2.2 -n 20 && A:\finish.exe" diff --git a/client/tests/kvm/unattended/win2008-32-autounattend.xml b/client/tests/kvm/unattended/win2008-32-autounattend.xml index 44a9fc4..74f99b1 100644 --- a/client/tests/kvm/unattended/win2008-32-autounattend.xml +++ b/client/tests/kvm/unattended/win2008-32-autounattend.xml @@ -116,30 +116,18 @@ 1 - %WINDIR%\System32\cmd /c start /w pkgmgr /iu:"TelnetServer" - - - 2 - %WINDIR%\System32\cmd /c sc config TlntSvr start= auto - - - 3 %WINDIR%\System32\cmd /c netsh firewall set opmode disable - 4 - %WINDIR%\System32\cmd /c net start telnet - - - 5 + 2 %WINDIR%\System32\cmd /c E:\setuprss.bat - 6 + 3 %WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" dhcp - 7 + 4 %WINDIR%\System32\cmd /c ping 10.0.2.2 -n 20 && A:\finish.exe diff --git a/client/tests/kvm/unattended/win2008-64-autounattend.xml b/client/tests/kvm/unattended/win2008-64-autounattend.xml index ea0a524..6e71cfd 100644 --- a/client/tests/kvm/unattended/win2008-64-autounattend.xml +++ b/client/tests/kvm/unattended/win2008-64-autounattend.xml @@ -125,30 +125,18 @@ 1 - %WINDIR%\System32\cmd /c start /w pkgmgr /iu:"TelnetServer" - - - 2 - %WINDIR%\System32\cmd /c sc config TlntSvr start= auto - - - 3 %WINDIR%\System32\cmd /c netsh firewall set opmode disable - 4 - %WINDIR%\System32\cmd /c net start telnet - - - 5 + 2 %WINDIR%\System32\cmd /c E:\setuprss.bat - 6 + 3 %WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" dhcp - 7 + 4 %WINDIR%\System32\cmd /c ping 10.0.2.2 -n 20 && A:\finish.exe diff --git a/client/tests/kvm/unattended/win2008-r2-autounattend.xml b/client/tests/kvm/unattended/win2008-r2-autounattend.xml index ea0a524..6e71cfd 100644 --- a/client/tests/kvm/unattended/win2008-r2-autounattend.xml +++ b/client/tests/kvm/unattended/win2008-r2-autounattend.xml @@ -125,30 +125,18 @@ 1 - %WINDIR%\System32\cmd /c start /w pkgmgr /iu:"TelnetServer" - - - 2 - %WINDIR%\System32\cmd /c sc config TlntSvr start= auto - - - 3 %WINDIR%\System32\cmd /c netsh firewall set opmode disable - 4 - %WINDIR%\System32\cmd /c net start telnet - - - 5 + 2 %WINDIR%\System32\cmd /c E:\setuprss.bat - 6 + 3 %WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" dhcp - 7 + 4 %WINDIR%\System32\cmd /c ping 10.0.2.2 -n 20 && A:\finish.exe diff --git a/client/tests/kvm/unattended/win7-32-autounattend.xml b/client/tests/kvm/unattended/win7-32-autounattend.xml index a577a91..39123bf 100644 --- a/client/tests/kvm/unattended/win7-32-autounattend.xml +++ b/client/tests/kvm/unattended/win7-32-autounattend.xml @@ -122,36 +122,24 @@ - %WINDIR%\System32\cmd /c start /w pkgmgr /iu:"TelnetServer" - 1 - - - %WINDIR%\System32\cmd /c sc config TlntSvr start= auto - 2 - - %WINDIR%\System32\cmd /c netsh firewall set opmode disable - 3 - - - %WINDIR%\System32\cmd /c net start telnet - 4 + 1 %WINDIR%\System32\cmd /c E:\setuprss.bat - 5 + 2 %WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" dhcp - 6 + 3 %WINDIR%\System32\cmd /c ping 10.0.2.2 -n 20 && A:\finish.exe - 7 + 4 - \ No newline at end of file + diff --git a/client/tests/kvm/unattended/win7-64-autounattend.xml b/client/tests/kvm/unattended/win7-64-autounattend.xml index fec8017..e39b9d7 100644 --- a/client/tests/kvm/unattended/win7-64-autounattend.xml +++ b/client/tests/kvm/unattended/win7-64-autounattend.xml @@ -122,36 +122,24 @@ - %WINDIR%\System32\cmd /c start /w pkgmgr /iu:"TelnetServer" - 1 - - - %WINDIR%\System32\cmd /c sc config TlntSvr start= auto - 2 - - %WINDIR%\System32\cmd /c netsh firewall set opmode disable - 3 - - - %WINDIR%\System32\cmd /c net start telnet - 4 + 1 %WINDIR%\System32\cmd /c E:\setuprss.bat - 5 + 2 %WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" dhcp - 6 + 3 %WINDIR%\System32\cmd /c ping 10.0.2.2 -n 20 && A:\finish.exe - 7 + 4 - \ No newline at end of file + diff --git a/client/tests/kvm/unattended/winvista-32-autounattend.xml b/client/tests/kvm/unattended/winvista-32-autounattend.xml index 7835a64..37c6de5 100644 --- a/client/tests/kvm/unattended/winvista-32-autounattend.xml +++ b/client/tests/kvm/unattended/winvista-32-autounattend.xml @@ -123,30 +123,18 @@ 1 - %WINDIR%\System32\cmd /c start /w pkgmgr /iu:"TelnetServer" - - - 2 - %WINDIR%\System32\cmd /c sc config TlntSvr start= auto - - - 3 %WINDIR%\System32\cmd /c netsh firewall set opmode disable - 4 - %WINDIR%\System32\cmd /c net start telnet - - - 5 + 2 %WINDIR%\System32\cmd /c E:\setuprss.bat - 6 + 3 %WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" dhcp - 7 + 4 %WINDIR%\System32\cmd /c ping 10.0.2.2 -n 20 && A:\finish.exe diff --git a/client/tests/kvm/unattended/winvista-64-autounattend.xml b/client/tests/kvm/unattended/winvista-64-autounattend.xml index ad68bf9..528e6ac 100644 --- a/client/tests/kvm/unattended/winvista-64-autounattend.xml +++ b/client/tests/kvm/unattended/winvista-64-autounattend.xml @@ -124,30 +124,18 @@ 1 - %WINDIR%\System32\cmd /c start /w pkgmgr /iu:"TelnetServer" - - - 2 - %WINDIR%\System32\cmd /c sc config TlntSvr start= auto - - - 3 %WINDIR%\System32\cmd /c netsh firewall set opmode disable - 4 - %WINDIR%\System32\cmd /c net start telnet - - - 5 + 2 %WINDIR%\System32\cmd /c E:\setuprss.bat - 6 + 3 %WINDIR%\System32\cmd /c netsh interface ip set address "Local Area Connection" dhcp - 7 + 4 %WINDIR%\System32\cmd /c ping 10.0.2.2 -n 20 && A:\finish.exe