From f9f115fe5275558b2395b9c6c62a5a48d821d2f4 Mon Sep 17 00:00:00 2001 From: lmr Date: Mon, 4 Jul 2011 14:43:30 +0000 Subject: [PATCH] KVM test: Reformat sample windows ini style unattended files If we prepend spaces on the key=value lines, ConfigParser will fail to parse the file. So let's reformat the files in a way that we won't have this problem again. Signed-off-by: Lucas Meneghel Rodrigues git-svn-id: svn://test.kernel.org/autotest/trunk@5480 592f7852-d20e-0410-864c-8624ca9c26a4 --- client/tests/kvm/unattended/win2000-32.sif | 149 ++++++++++++++-------------- client/tests/kvm/unattended/win2003-32.sif | 132 ++++++++++++------------- client/tests/kvm/unattended/win2003-64.sif | 132 ++++++++++++------------- client/tests/kvm/unattended/winxp32.sif | 153 ++++++++++++++--------------- client/tests/kvm/unattended/winxp64.sif | 153 ++++++++++++++--------------- 5 files changed, 360 insertions(+), 359 deletions(-) rewrite client/tests/kvm/unattended/win2000-32.sif (83%) rewrite client/tests/kvm/unattended/win2003-32.sif (83%) rewrite client/tests/kvm/unattended/win2003-64.sif (83%) rewrite client/tests/kvm/unattended/winxp32.sif (85%) rewrite client/tests/kvm/unattended/winxp64.sif (85%) diff --git a/client/tests/kvm/unattended/win2000-32.sif b/client/tests/kvm/unattended/win2000-32.sif dissimilarity index 83% index 87208511..6aa18482 100644 --- a/client/tests/kvm/unattended/win2000-32.sif +++ b/client/tests/kvm/unattended/win2000-32.sif @@ -1,73 +1,76 @@ -;SetupMgrTag -[Data] - AutoPartition=1 - MsDosInitiated="0" - UnattendedInstall="Yes" - -[Unattended] - Repartition=Yes - UnattendMode=FullUnattended - OemSkipEula=Yes - OemPreinstall=No - TargetPath=\WINDOWS - UnattendSwitch=Yes - CrashDumpSetting=1 - DriverSigningPolicy=ignore - WaitForReboot=no - -[GuiUnattended] - AdminPassword="1q2w3eP" - EncryptedAdminPassword=NO - TimeZone=85 - OemSkipWelcome=1 - AutoLogon=Yes - AutoLogonCount=1000 - OEMSkipRegional=1 - -[UserData] - ProductKey=KVM_TEST_CDKEY - FullName="Autotest Mindless Drone" - OrgName="Autotest" - ComputerName=* - -[Identification] - JoinWorkgroup=WORKGROUP - -[Networking] - InstallDefaultComponents=Yes - -[Proxy] - Proxy_Enable=0 - Use_Same_Proxy=0 - -[Components] - dialer=off - media_clips=off - media_utopia=off - msnexplr=off - netoc=off - OEAccess=off - templates=off - WMAccess=off - zonegames=off - -[TerminalServices] - AllowConnections=1 - -[WindowsFirewall] - Profiles=WindowsFirewall.TurnOffFirewall - -[WindowsFirewall.TurnOffFirewall] - Mode=0 - -[Branding] - BrandIEUsingUnattended=Yes - -[Display] - Xresolution=1024 - YResolution=768 - -[GuiRunOnce] - Command0="cmd /c E:\setuprss.bat" - Command1="cmd /c netsh interface ip set address local dhcp" - Command2="cmd /c A:\finish.exe" +[Data] +AutoPartition = 1 +MsDosInitiated = "0" +UnattendedInstall = "Yes" + +[Unattended] +Repartition = Yes +UnattendMode = FullUnattended +OemSkipEula = Yes +OemPreinstall = No +TargetPath = \WINDOWS +UnattendSwitch = Yes +CrashDumpSetting = 1 +DriverSigningPolicy = ignore +OemPnPDriversPath = KVM_TEST_NETWORK_DRIVER_PATH +WaitForReboot = no + +[GuiUnattended] +AdminPassword = "1q2w3eP" +EncryptedAdminPassword = NO +TimeZone = 85 +OemSkipWelcome = 1 +AutoLogon = Yes +AutoLogonCount = 1000 +OEMSkipRegional = 1 + +[UserData] +ProductKey = KVM_TEST_CDKEY +FullName = "Autotest Mindless Drone" +OrgName = "Autotest" +ComputerName = * + +[Identification] +JoinWorkgroup = WORKGROUP + +[Networking] +InstallDefaultComponents = Yes + +[Proxy] +Proxy_Enable = 0 +Use_Same_Proxy = 0 + +[Components] +dialer = off +media_clips = off +media_utopia = off +msnexplr = off +netoc = off +OEAccess = off +templates = off +WMAccess = off +zonegames = off + +[TerminalServices] +AllowConnections = 1 + +[WindowsFirewall] +Profiles = WindowsFirewall.TurnOffFirewall + +[WindowsFirewall.TurnOffFirewall] +Mode = 0 + +[Branding] +BrandIEUsingUnattended = Yes + +[Display] +Xresolution = 1024 +YResolution = 768 + +[GuiRunOnce] +Command0 = "cmd /c KVM_TEST_VIRTIO_NETWORK_INSTALLER" +Command1 = "cmd /c E:\setuprss.bat" +Command2 = "cmd /c netsh interface ip set address local dhcp" +Command3 = "cmd /c sc config tlntsvr start= auto" +Command4 = "cmd /c net start telnet" +Command5 = "cmd /c A:\finish.exe" diff --git a/client/tests/kvm/unattended/win2003-32.sif b/client/tests/kvm/unattended/win2003-32.sif dissimilarity index 83% index 207cd2b4..6e69b5ee 100644 --- a/client/tests/kvm/unattended/win2003-32.sif +++ b/client/tests/kvm/unattended/win2003-32.sif @@ -1,66 +1,66 @@ -[Data] - AutoPartition = 1 - MsDosInitiated = 0 - UnattendedInstall = Yes - -[Unattended] - UnattendMode = FullUnattended - OemSkipEula = Yes - OemPreinstall = No - UnattendSwitch = Yes - CrashDumpSetting = 1 - DriverSigningPolicy = ignore - OemPnPDriversPath="KVM_TEST_NETWORK_DRIVER_PATH" - WaitForReboot = no - Repartition = yes - -[GuiUnattended] - AdminPassword = "1q2w3eP" - AutoLogon = Yes - AutoLogonCount = 1000 - OEMSkipRegional = 1 - TimeZone = 85 - OemSkipWelcome = 1 - -[UserData] - ProductKey=KVM_TEST_CDKEY - FullName="Autotest Mindless Drone" - OrgName="Autotest" - ComputerName=* - -[LicenseFilePrintData] - AutoMode=PerServer - AutoUsers=15 - -[Identification] - JoinWorkgroup=WORKGROUP - -[Networking] - InstallDefaultComponents=Yes - -[Components] - -[TerminalServices] - AllowConnections = 1 - -[WindowsFirewall] - Profiles = WindowsFirewall.TurnOffFirewall - -[WindowsFirewall.TurnOffFirewall] - Mode = 0 - -[SetupParams] - local="Local Area Connection" - -[Display] - Xresolution=1024 - YResolution=768 - -[GuiRunOnce] - Command0="cmd /c KVM_TEST_VIRTIO_NETWORK_INSTALLER" - Command1="cmd /c sc config TlntSvr start= auto" - Command2="cmd /c netsh firewall set opmode disable" - Command3="cmd /c net start telnet" - Command4="cmd /c E:\setuprss.bat" - Command5="cmd /c netsh interface ip set address local dhcp" - Command6="cmd /c A:\finish.exe" +[Data] +AutoPartition = 1 +MsDosInitiated = 0 +UnattendedInstall = Yes + +[Unattended] +UnattendMode = FullUnattended +OemSkipEula = Yes +OemPreinstall = No +UnattendSwitch = Yes +CrashDumpSetting = 1 +DriverSigningPolicy = ignore +OemPnPDriversPath = KVM_TEST_NETWORK_DRIVER_PATH +WaitForReboot = no +Repartition = yes + +[GuiUnattended] +AdminPassword = "1q2w3eP" +AutoLogon = Yes +AutoLogonCount = 1000 +OEMSkipRegional = 1 +TimeZone = 85 +OemSkipWelcome = 1 + +[UserData] +ProductKey = KVM_TEST_CDKEY +FullName = "Autotest Mindless Drone" +OrgName = "Autotest" +ComputerName = * + +[LicenseFilePrintData] +AutoMode = PerServer +AutoUsers = 15 + +[Identification] +JoinWorkgroup = WORKGROUP + +[Networking] +InstallDefaultComponents = Yes + +[Components] + +[TerminalServices] +AllowConnections = 1 + +[WindowsFirewall] +Profiles = WindowsFirewall.TurnOffFirewall + +[WindowsFirewall.TurnOffFirewall] +Mode = 0 + +[SetupParams] +local = "Local Area Connection" + +[Display] +Xresolution = 1024 +YResolution = 768 + +[GuiRunOnce] +Command0 = "cmd /c KVM_TEST_VIRTIO_NETWORK_INSTALLER" +Command1 = "cmd /c sc config TlntSvr start= auto" +Command2 = "cmd /c netsh firewall set opmode disable" +Command3 = "cmd /c net start telnet" +Command4 = "cmd /c E:\setuprss.bat" +Command5 = "cmd /c netsh interface ip set address local dhcp" +Command6 = "cmd /c A:\finish.exe" diff --git a/client/tests/kvm/unattended/win2003-64.sif b/client/tests/kvm/unattended/win2003-64.sif dissimilarity index 83% index 207cd2b4..6e69b5ee 100644 --- a/client/tests/kvm/unattended/win2003-64.sif +++ b/client/tests/kvm/unattended/win2003-64.sif @@ -1,66 +1,66 @@ -[Data] - AutoPartition = 1 - MsDosInitiated = 0 - UnattendedInstall = Yes - -[Unattended] - UnattendMode = FullUnattended - OemSkipEula = Yes - OemPreinstall = No - UnattendSwitch = Yes - CrashDumpSetting = 1 - DriverSigningPolicy = ignore - OemPnPDriversPath="KVM_TEST_NETWORK_DRIVER_PATH" - WaitForReboot = no - Repartition = yes - -[GuiUnattended] - AdminPassword = "1q2w3eP" - AutoLogon = Yes - AutoLogonCount = 1000 - OEMSkipRegional = 1 - TimeZone = 85 - OemSkipWelcome = 1 - -[UserData] - ProductKey=KVM_TEST_CDKEY - FullName="Autotest Mindless Drone" - OrgName="Autotest" - ComputerName=* - -[LicenseFilePrintData] - AutoMode=PerServer - AutoUsers=15 - -[Identification] - JoinWorkgroup=WORKGROUP - -[Networking] - InstallDefaultComponents=Yes - -[Components] - -[TerminalServices] - AllowConnections = 1 - -[WindowsFirewall] - Profiles = WindowsFirewall.TurnOffFirewall - -[WindowsFirewall.TurnOffFirewall] - Mode = 0 - -[SetupParams] - local="Local Area Connection" - -[Display] - Xresolution=1024 - YResolution=768 - -[GuiRunOnce] - Command0="cmd /c KVM_TEST_VIRTIO_NETWORK_INSTALLER" - Command1="cmd /c sc config TlntSvr start= auto" - Command2="cmd /c netsh firewall set opmode disable" - Command3="cmd /c net start telnet" - Command4="cmd /c E:\setuprss.bat" - Command5="cmd /c netsh interface ip set address local dhcp" - Command6="cmd /c A:\finish.exe" +[Data] +AutoPartition = 1 +MsDosInitiated = 0 +UnattendedInstall = Yes + +[Unattended] +UnattendMode = FullUnattended +OemSkipEula = Yes +OemPreinstall = No +UnattendSwitch = Yes +CrashDumpSetting = 1 +DriverSigningPolicy = ignore +OemPnPDriversPath = KVM_TEST_NETWORK_DRIVER_PATH +WaitForReboot = no +Repartition = yes + +[GuiUnattended] +AdminPassword = "1q2w3eP" +AutoLogon = Yes +AutoLogonCount = 1000 +OEMSkipRegional = 1 +TimeZone = 85 +OemSkipWelcome = 1 + +[UserData] +ProductKey = KVM_TEST_CDKEY +FullName = "Autotest Mindless Drone" +OrgName = "Autotest" +ComputerName = * + +[LicenseFilePrintData] +AutoMode = PerServer +AutoUsers = 15 + +[Identification] +JoinWorkgroup = WORKGROUP + +[Networking] +InstallDefaultComponents = Yes + +[Components] + +[TerminalServices] +AllowConnections = 1 + +[WindowsFirewall] +Profiles = WindowsFirewall.TurnOffFirewall + +[WindowsFirewall.TurnOffFirewall] +Mode = 0 + +[SetupParams] +local = "Local Area Connection" + +[Display] +Xresolution = 1024 +YResolution = 768 + +[GuiRunOnce] +Command0 = "cmd /c KVM_TEST_VIRTIO_NETWORK_INSTALLER" +Command1 = "cmd /c sc config TlntSvr start= auto" +Command2 = "cmd /c netsh firewall set opmode disable" +Command3 = "cmd /c net start telnet" +Command4 = "cmd /c E:\setuprss.bat" +Command5 = "cmd /c netsh interface ip set address local dhcp" +Command6 = "cmd /c A:\finish.exe" diff --git a/client/tests/kvm/unattended/winxp32.sif b/client/tests/kvm/unattended/winxp32.sif dissimilarity index 85% index 4696e293..6aa18482 100644 --- a/client/tests/kvm/unattended/winxp32.sif +++ b/client/tests/kvm/unattended/winxp32.sif @@ -1,77 +1,76 @@ -;SetupMgrTag -[Data] - AutoPartition=1 - MsDosInitiated="0" - UnattendedInstall="Yes" - -[Unattended] - Repartition=Yes - UnattendMode=FullUnattended - OemSkipEula=Yes - OemPreinstall=No - TargetPath=\WINDOWS - UnattendSwitch=Yes - CrashDumpSetting=1 - DriverSigningPolicy=ignore - OemPnPDriversPath="KVM_TEST_NETWORK_DRIVER_PATH" - WaitForReboot=no - -[GuiUnattended] - AdminPassword="1q2w3eP" - EncryptedAdminPassword=NO - TimeZone=85 - OemSkipWelcome=1 - AutoLogon=Yes - AutoLogonCount=1000 - OEMSkipRegional=1 - -[UserData] - ProductKey=KVM_TEST_CDKEY - FullName="Autotest Mindless Drone" - OrgName="Autotest" - ComputerName=* - -[Identification] - JoinWorkgroup=WORKGROUP - -[Networking] - InstallDefaultComponents=Yes - -[Proxy] - Proxy_Enable=0 - Use_Same_Proxy=0 - -[Components] - dialer=off - media_clips=off - media_utopia=off - msnexplr=off - netoc=off - OEAccess=off - templates=off - WMAccess=off - zonegames=off - -[TerminalServices] - AllowConnections=1 - -[WindowsFirewall] - Profiles=WindowsFirewall.TurnOffFirewall - -[WindowsFirewall.TurnOffFirewall] - Mode=0 - -[Branding] - BrandIEUsingUnattended=Yes - -[Display] - Xresolution=1024 - YResolution=768 - -[GuiRunOnce] - Command0="cmd /c KVM_TEST_VIRTIO_NETWORK_INSTALLER" - Command1="cmd /c E:\setuprss.bat" - Command2="cmd /c netsh interface ip set address local dhcp" - Command3="cmd /c sc config tlntsvr start= auto" - Command4="cmd /c net start telnet" - Command5="cmd /c A:\finish.exe" +[Data] +AutoPartition = 1 +MsDosInitiated = "0" +UnattendedInstall = "Yes" + +[Unattended] +Repartition = Yes +UnattendMode = FullUnattended +OemSkipEula = Yes +OemPreinstall = No +TargetPath = \WINDOWS +UnattendSwitch = Yes +CrashDumpSetting = 1 +DriverSigningPolicy = ignore +OemPnPDriversPath = KVM_TEST_NETWORK_DRIVER_PATH +WaitForReboot = no + +[GuiUnattended] +AdminPassword = "1q2w3eP" +EncryptedAdminPassword = NO +TimeZone = 85 +OemSkipWelcome = 1 +AutoLogon = Yes +AutoLogonCount = 1000 +OEMSkipRegional = 1 + +[UserData] +ProductKey = KVM_TEST_CDKEY +FullName = "Autotest Mindless Drone" +OrgName = "Autotest" +ComputerName = * + +[Identification] +JoinWorkgroup = WORKGROUP + +[Networking] +InstallDefaultComponents = Yes + +[Proxy] +Proxy_Enable = 0 +Use_Same_Proxy = 0 + +[Components] +dialer = off +media_clips = off +media_utopia = off +msnexplr = off +netoc = off +OEAccess = off +templates = off +WMAccess = off +zonegames = off + +[TerminalServices] +AllowConnections = 1 + +[WindowsFirewall] +Profiles = WindowsFirewall.TurnOffFirewall + +[WindowsFirewall.TurnOffFirewall] +Mode = 0 + +[Branding] +BrandIEUsingUnattended = Yes + +[Display] +Xresolution = 1024 +YResolution = 768 + +[GuiRunOnce] +Command0 = "cmd /c KVM_TEST_VIRTIO_NETWORK_INSTALLER" +Command1 = "cmd /c E:\setuprss.bat" +Command2 = "cmd /c netsh interface ip set address local dhcp" +Command3 = "cmd /c sc config tlntsvr start= auto" +Command4 = "cmd /c net start telnet" +Command5 = "cmd /c A:\finish.exe" diff --git a/client/tests/kvm/unattended/winxp64.sif b/client/tests/kvm/unattended/winxp64.sif dissimilarity index 85% index 4696e293..6aa18482 100644 --- a/client/tests/kvm/unattended/winxp64.sif +++ b/client/tests/kvm/unattended/winxp64.sif @@ -1,77 +1,76 @@ -;SetupMgrTag -[Data] - AutoPartition=1 - MsDosInitiated="0" - UnattendedInstall="Yes" - -[Unattended] - Repartition=Yes - UnattendMode=FullUnattended - OemSkipEula=Yes - OemPreinstall=No - TargetPath=\WINDOWS - UnattendSwitch=Yes - CrashDumpSetting=1 - DriverSigningPolicy=ignore - OemPnPDriversPath="KVM_TEST_NETWORK_DRIVER_PATH" - WaitForReboot=no - -[GuiUnattended] - AdminPassword="1q2w3eP" - EncryptedAdminPassword=NO - TimeZone=85 - OemSkipWelcome=1 - AutoLogon=Yes - AutoLogonCount=1000 - OEMSkipRegional=1 - -[UserData] - ProductKey=KVM_TEST_CDKEY - FullName="Autotest Mindless Drone" - OrgName="Autotest" - ComputerName=* - -[Identification] - JoinWorkgroup=WORKGROUP - -[Networking] - InstallDefaultComponents=Yes - -[Proxy] - Proxy_Enable=0 - Use_Same_Proxy=0 - -[Components] - dialer=off - media_clips=off - media_utopia=off - msnexplr=off - netoc=off - OEAccess=off - templates=off - WMAccess=off - zonegames=off - -[TerminalServices] - AllowConnections=1 - -[WindowsFirewall] - Profiles=WindowsFirewall.TurnOffFirewall - -[WindowsFirewall.TurnOffFirewall] - Mode=0 - -[Branding] - BrandIEUsingUnattended=Yes - -[Display] - Xresolution=1024 - YResolution=768 - -[GuiRunOnce] - Command0="cmd /c KVM_TEST_VIRTIO_NETWORK_INSTALLER" - Command1="cmd /c E:\setuprss.bat" - Command2="cmd /c netsh interface ip set address local dhcp" - Command3="cmd /c sc config tlntsvr start= auto" - Command4="cmd /c net start telnet" - Command5="cmd /c A:\finish.exe" +[Data] +AutoPartition = 1 +MsDosInitiated = "0" +UnattendedInstall = "Yes" + +[Unattended] +Repartition = Yes +UnattendMode = FullUnattended +OemSkipEula = Yes +OemPreinstall = No +TargetPath = \WINDOWS +UnattendSwitch = Yes +CrashDumpSetting = 1 +DriverSigningPolicy = ignore +OemPnPDriversPath = KVM_TEST_NETWORK_DRIVER_PATH +WaitForReboot = no + +[GuiUnattended] +AdminPassword = "1q2w3eP" +EncryptedAdminPassword = NO +TimeZone = 85 +OemSkipWelcome = 1 +AutoLogon = Yes +AutoLogonCount = 1000 +OEMSkipRegional = 1 + +[UserData] +ProductKey = KVM_TEST_CDKEY +FullName = "Autotest Mindless Drone" +OrgName = "Autotest" +ComputerName = * + +[Identification] +JoinWorkgroup = WORKGROUP + +[Networking] +InstallDefaultComponents = Yes + +[Proxy] +Proxy_Enable = 0 +Use_Same_Proxy = 0 + +[Components] +dialer = off +media_clips = off +media_utopia = off +msnexplr = off +netoc = off +OEAccess = off +templates = off +WMAccess = off +zonegames = off + +[TerminalServices] +AllowConnections = 1 + +[WindowsFirewall] +Profiles = WindowsFirewall.TurnOffFirewall + +[WindowsFirewall.TurnOffFirewall] +Mode = 0 + +[Branding] +BrandIEUsingUnattended = Yes + +[Display] +Xresolution = 1024 +YResolution = 768 + +[GuiRunOnce] +Command0 = "cmd /c KVM_TEST_VIRTIO_NETWORK_INSTALLER" +Command1 = "cmd /c E:\setuprss.bat" +Command2 = "cmd /c netsh interface ip set address local dhcp" +Command3 = "cmd /c sc config tlntsvr start= auto" +Command4 = "cmd /c net start telnet" +Command5 = "cmd /c A:\finish.exe" -- 2.11.4.GIT