The telnet service isn't used by kvm-autotest (AFAIK) and may interfere with
rss.exe (port 23).
Signed-off-by: Michael Goldish <mgold...@redhat.com>
---
client/tests/kvm/unattended/win2003-32.sif | 10 +++-----
client/tests/kvm/unattended/win2003-64.sif | 10 +++-----
.../kvm/unattended/win2008-32-autounattend.xml | 18 ++-------------
.../kvm/unattended/win2008-64-autounattend.xml | 18 ++-------------
.../kvm/unattended/win2008-r2-autounattend.xml | 18 ++-------------
.../tests/kvm/unattended/win7-32-autounattend.xml | 22 ++++---------------
.../tests/kvm/unattended/win7-64-autounattend.xml | 22 ++++---------------
.../kvm/unattended/winvista-32-autounattend.xml | 18 ++-------------
.../kvm/unattended/winvista-64-autounattend.xml | 18 ++-------------
9 files changed, 33 insertions(+), 121 deletions(-)
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 @@
<FirstLogonCommands>
<SynchronousCommand wcm:action="add">
<Order>1</Order>
- <CommandLine>%WINDIR%\System32\cmd /c
start /w pkgmgr /iu:"TelnetServer"</CommandLine>
- </SynchronousCommand>
- <SynchronousCommand wcm:action="add">
- <Order>2</Order>
- <CommandLine>%WINDIR%\System32\cmd /c
sc config TlntSvr start= auto</CommandLine>
- </SynchronousCommand>
- <SynchronousCommand wcm:action="add">
- <Order>3</Order>
<CommandLine>%WINDIR%\System32\cmd /c
netsh firewall set opmode disable</CommandLine>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
- <Order>4</Order>
- <CommandLine>%WINDIR%\System32\cmd /c
net start telnet</CommandLine>
- </SynchronousCommand>
- <SynchronousCommand wcm:action="add">
- <Order>5</Order>
+ <Order>2</Order>
<CommandLine>%WINDIR%\System32\cmd /c
E:\setuprss.bat</CommandLine>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
- <Order>6</Order>
+ <Order>3</Order>
<CommandLine>%WINDIR%\System32\cmd /c
netsh interface ip set address "Local Area Connection" dhcp</CommandLine>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
- <Order>7</Order>
+ <Order>4</Order>
<CommandLine>%WINDIR%\System32\cmd /c
ping 10.0.2.2 -n 20 && A:\finish.exe</CommandLine>
</SynchronousCommand>
</FirstLogonCommands>
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 @@
<FirstLogonCommands>
<SynchronousCommand wcm:action="add">
<Order>1</Order>
- <CommandLine>%WINDIR%\System32\cmd /c
start /w pkgmgr /iu:"TelnetServer"</CommandLine>
- </SynchronousCommand>
- <SynchronousCommand wcm:action="add">
- <Order>2</Order>
- <CommandLine>%WINDIR%\System32\cmd /c
sc config TlntSvr start= auto</CommandLine>
- </SynchronousCommand>
- <SynchronousCommand wcm:action="add">
- <Order>3</Order>
<CommandLine>%WINDIR%\System32\cmd /c
netsh firewall set opmode disable</CommandLine>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
- <Order>4</Order>
- <CommandLine>%WINDIR%\System32\cmd /c
net start telnet</CommandLine>
- </SynchronousCommand>
- <SynchronousCommand wcm:action="add">
- <Order>5</Order>
+ <Order>2</Order>
<CommandLine>%WINDIR%\System32\cmd /c
E:\setuprss.bat</CommandLine>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
- <Order>6</Order>
+ <Order>3</Order>
<CommandLine>%WINDIR%\System32\cmd /c
netsh interface ip set address "Local Area Connection" dhcp</CommandLine>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
- <Order>7</Order>
+ <Order>4</Order>
<CommandLine>%WINDIR%\System32\cmd /c
ping 10.0.2.2 -n 20 && A:\finish.exe</CommandLine>
</SynchronousCommand>
</FirstLogonCommands>
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 @@
<FirstLogonCommands>
<SynchronousCommand wcm:action="add">
<Order>1</Order>
- <CommandLine>%WINDIR%\System32\cmd /c
start /w pkgmgr /iu:"TelnetServer"</CommandLine>
- </SynchronousCommand>
- <SynchronousCommand wcm:action="add">
- <Order>2</Order>
- <CommandLine>%WINDIR%\System32\cmd /c
sc config TlntSvr start= auto</CommandLine>
- </SynchronousCommand>
- <SynchronousCommand wcm:action="add">
- <Order>3</Order>
<CommandLine>%WINDIR%\System32\cmd /c
netsh firewall set opmode disable</CommandLine>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
- <Order>4</Order>
- <CommandLine>%WINDIR%\System32\cmd /c
net start telnet</CommandLine>
- </SynchronousCommand>
- <SynchronousCommand wcm:action="add">
- <Order>5</Order>
+ <Order>2</Order>
<CommandLine>%WINDIR%\System32\cmd /c
E:\setuprss.bat</CommandLine>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
- <Order>6</Order>
+ <Order>3</Order>
<CommandLine>%WINDIR%\System32\cmd /c
netsh interface ip set address "Local Area Connection" dhcp</CommandLine>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
- <Order>7</Order>
+ <Order>4</Order>
<CommandLine>%WINDIR%\System32\cmd /c
ping 10.0.2.2 -n 20 && A:\finish.exe</CommandLine>
</SynchronousCommand>
</FirstLogonCommands>
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 @@
</AutoLogon>
<FirstLogonCommands>
<SynchronousCommand wcm:action="add">
- <CommandLine>%WINDIR%\System32\cmd /c
start /w pkgmgr /iu:"TelnetServer"</CommandLine>
- <Order>1</Order>
- </SynchronousCommand>
- <SynchronousCommand wcm:action="add">
- <CommandLine>%WINDIR%\System32\cmd /c
sc config TlntSvr start= auto</CommandLine>
- <Order>2</Order>
- </SynchronousCommand>
- <SynchronousCommand wcm:action="add">
<CommandLine>%WINDIR%\System32\cmd /c
netsh firewall set opmode disable</CommandLine>
- <Order>3</Order>
- </SynchronousCommand>
- <SynchronousCommand wcm:action="add">
- <CommandLine>%WINDIR%\System32\cmd /c
net start telnet</CommandLine>
- <Order>4</Order>
+ <Order>1</Order>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
<CommandLine>%WINDIR%\System32\cmd /c
E:\setuprss.bat</CommandLine>
- <Order>5</Order>
+ <Order>2</Order>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
<CommandLine>%WINDIR%\System32\cmd /c
netsh interface ip set address "Local Area Connection" dhcp</CommandLine>
- <Order>6</Order>
+ <Order>3</Order>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
<CommandLine>%WINDIR%\System32\cmd /c
ping 10.0.2.2 -n 20 && A:\finish.exe</CommandLine>
- <Order>7</Order>
+ <Order>4</Order>
</SynchronousCommand>
</FirstLogonCommands>
</component>
</settings>
<cpi:offlineImage cpi:source="wim:c:/install.wim#Windows Longhorn
SERVERSTANDARD"
xmlns:cpi="urn:schemas-microsoft-com:cpi" />
-</unattend>
\ No newline at end of file
+</unattend>
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 @@
</AutoLogon>
<FirstLogonCommands>
<SynchronousCommand wcm:action="add">
- <CommandLine>%WINDIR%\System32\cmd /c
start /w pkgmgr /iu:"TelnetServer"</CommandLine>
- <Order>1</Order>
- </SynchronousCommand>
- <SynchronousCommand wcm:action="add">
- <CommandLine>%WINDIR%\System32\cmd /c
sc config TlntSvr start= auto</CommandLine>
- <Order>2</Order>
- </SynchronousCommand>
- <SynchronousCommand wcm:action="add">
<CommandLine>%WINDIR%\System32\cmd /c
netsh firewall set opmode disable</CommandLine>
- <Order>3</Order>
- </SynchronousCommand>
- <SynchronousCommand wcm:action="add">
- <CommandLine>%WINDIR%\System32\cmd /c
net start telnet</CommandLine>
- <Order>4</Order>
+ <Order>1</Order>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
<CommandLine>%WINDIR%\System32\cmd /c
E:\setuprss.bat</CommandLine>
- <Order>5</Order>
+ <Order>2</Order>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
<CommandLine>%WINDIR%\System32\cmd /c
netsh interface ip set address "Local Area Connection" dhcp</CommandLine>
- <Order>6</Order>
+ <Order>3</Order>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
<CommandLine>%WINDIR%\System32\cmd /c
ping 10.0.2.2 -n 20 && A:\finish.exe</CommandLine>
- <Order>7</Order>
+ <Order>4</Order>
</SynchronousCommand>
</FirstLogonCommands>
</component>
</settings>
<cpi:offlineImage cpi:source="wim:c:/install.wim#Windows Longhorn
SERVERSTANDARD"
xmlns:cpi="urn:schemas-microsoft-com:cpi" />
-</unattend>
\ No newline at end of file
+</unattend>
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 @@
<FirstLogonCommands>
<SynchronousCommand wcm:action="add">
<Order>1</Order>
- <CommandLine>%WINDIR%\System32\cmd /c
start /w pkgmgr /iu:"TelnetServer"</CommandLine>
- </SynchronousCommand>
- <SynchronousCommand wcm:action="add">
- <Order>2</Order>
- <CommandLine>%WINDIR%\System32\cmd /c
sc config TlntSvr start= auto</CommandLine>
- </SynchronousCommand>
- <SynchronousCommand wcm:action="add">
- <Order>3</Order>
<CommandLine>%WINDIR%\System32\cmd /c
netsh firewall set opmode disable</CommandLine>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
- <Order>4</Order>
- <CommandLine>%WINDIR%\System32\cmd /c
net start telnet</CommandLine>
- </SynchronousCommand>
- <SynchronousCommand wcm:action="add">
- <Order>5</Order>
+ <Order>2</Order>
<CommandLine>%WINDIR%\System32\cmd /c
E:\setuprss.bat</CommandLine>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
- <Order>6</Order>
+ <Order>3</Order>
<CommandLine>%WINDIR%\System32\cmd /c
netsh interface ip set address "Local Area Connection" dhcp</CommandLine>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
- <Order>7</Order>
+ <Order>4</Order>
<CommandLine>%WINDIR%\System32\cmd /c
ping 10.0.2.2 -n 20 && A:\finish.exe</CommandLine>
</SynchronousCommand>
</FirstLogonCommands>
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 @@
<FirstLogonCommands>
<SynchronousCommand wcm:action="add">
<Order>1</Order>
- <CommandLine>%WINDIR%\System32\cmd /c
start /w pkgmgr /iu:"TelnetServer"</CommandLine>
- </SynchronousCommand>
- <SynchronousCommand wcm:action="add">
- <Order>2</Order>
- <CommandLine>%WINDIR%\System32\cmd /c
sc config TlntSvr start= auto</CommandLine>
- </SynchronousCommand>
- <SynchronousCommand wcm:action="add">
- <Order>3</Order>
<CommandLine>%WINDIR%\System32\cmd /c
netsh firewall set opmode disable</CommandLine>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
- <Order>4</Order>
- <CommandLine>%WINDIR%\System32\cmd /c
net start telnet</CommandLine>
- </SynchronousCommand>
- <SynchronousCommand wcm:action="add">
- <Order>5</Order>
+ <Order>2</Order>
<CommandLine>%WINDIR%\System32\cmd /c
E:\setuprss.bat</CommandLine>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
- <Order>6</Order>
+ <Order>3</Order>
<CommandLine>%WINDIR%\System32\cmd /c
netsh interface ip set address "Local Area Connection" dhcp</CommandLine>
</SynchronousCommand>
<SynchronousCommand wcm:action="add">
- <Order>7</Order>
+ <Order>4</Order>
<CommandLine>%WINDIR%\System32\cmd /c
ping 10.0.2.2 -n 20 && A:\finish.exe</CommandLine>
</SynchronousCommand>
</FirstLogonCommands>
--
1.5.4.1
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
