* [PATCH 0/3] KVM test: Windows install fixes
@ 2011-07-01 8:01 Lucas Meneghel Rodrigues
2011-07-01 8:01 ` [PATCH 1/3] KVM test: Render unattended files more properly Lucas Meneghel Rodrigues
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Lucas Meneghel Rodrigues @ 2011-07-01 8:01 UTC (permalink / raw)
To: autotest; +Cc: kvm
These 3 patches fixes problems found when performing a full
round of windows installs.
Lucas Meneghel Rodrigues (3):
KVM test: Render unattended files more properly
KVM test: Update Win2003 CD info to match MSDN registers
KVM test: Reformat sample windows ini style unattended files
client/tests/kvm/tests/unattended_install.py | 191 +++++++++++++++++---------
client/tests/kvm/tests_base.cfg.sample | 44 +++++--
client/tests/kvm/unattended/win2000-32.sif | 95 +++++++------
client/tests/kvm/unattended/win2003-32.sif | 78 ++++++------
client/tests/kvm/unattended/win2003-64.sif | 78 ++++++------
client/tests/kvm/unattended/winxp32.sif | 99 +++++++-------
client/tests/kvm/unattended/winxp64.sif | 99 +++++++-------
7 files changed, 386 insertions(+), 298 deletions(-)
--
1.7.5.4
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/3] KVM test: Render unattended files more properly
2011-07-01 8:01 [PATCH 0/3] KVM test: Windows install fixes Lucas Meneghel Rodrigues
@ 2011-07-01 8:01 ` Lucas Meneghel Rodrigues
2011-07-01 8:01 ` [PATCH 2/3] KVM test: Update Win2003 CD info to match MSDN registers Lucas Meneghel Rodrigues
2011-07-01 8:01 ` [PATCH 3/3] KVM test: Reformat sample windows ini style unattended files Lucas Meneghel Rodrigues
2 siblings, 0 replies; 4+ messages in thread
From: Lucas Meneghel Rodrigues @ 2011-07-01 8:01 UTC (permalink / raw)
To: autotest; +Cc: kvm
Windows2008 install program does not behave well when
we specify dummy paths to alternate install drivers,
unlike Windows Vista and Windows 7. This is enough
motivation to rewrite the unattended install file
rendering code, now:
1) XML files will be properly modified using an XML API
2) ini files will be properly modified using ConfigParser
3) kickstart files use a simplified version of the old
logic (re.sub).
Tested with the guest OS that motivated the patch and
of course, other linux and windows guests, everything
looks good.
Signed-off-by: Lucas Meneghel Rodrigues <lmr@redhat.com>
---
client/tests/kvm/tests/unattended_install.py | 191 +++++++++++++++++---------
1 files changed, 129 insertions(+), 62 deletions(-)
diff --git a/client/tests/kvm/tests/unattended_install.py b/client/tests/kvm/tests/unattended_install.py
index d1c700d..6d6ee07 100644
--- a/client/tests/kvm/tests/unattended_install.py
+++ b/client/tests/kvm/tests/unattended_install.py
@@ -1,4 +1,5 @@
import logging, time, socket, re, os, shutil, tempfile, glob, ConfigParser
+import xml.dom.minidom
from autotest_lib.client.common_lib import error
from autotest_lib.client.bin import utils
from autotest_lib.client.virt import virt_vm, virt_utils
@@ -47,8 +48,8 @@ class Disk(object):
self.path = None
- def setup_answer_file(self, filename, contents):
- utils.open_write_close(os.path.join(self.mount, filename), contents)
+ def get_answer_file_path(self, filename):
+ return os.path.join(self.mount, filename)
def copy_to(self, src):
@@ -258,8 +259,7 @@ class UnattendedInstallConfig(object):
self.image_path = os.path.dirname(self.kernel)
- @error.context_aware
- def render_answer_file(self):
+ def answer_kickstart(self, answer_path):
"""
Replace KVM_TEST_CDKEY (in the unattended file) with the cdkey
provided for this test and replace the KVM_TEST_MEDIUM with
@@ -267,17 +267,12 @@ class UnattendedInstallConfig(object):
@return: Answer file contents
"""
- error.base_context('Rendering final answer file')
- error.context('Reading answer file %s' % self.unattended_file)
- unattended_contents = open(self.unattended_file).read()
+ contents = open(self.unattended_file).read()
+
dummy_cdkey_re = r'\bKVM_TEST_CDKEY\b'
- if re.search(dummy_cdkey_re, unattended_contents):
+ if re.search(dummy_cdkey_re, contents):
if self.cdkey:
- unattended_contents = re.sub(dummy_cdkey_re, self.cdkey,
- unattended_contents)
- else:
- print ("WARNING: 'cdkey' required but not specified for "
- "this unattended installation")
+ contents = re.sub(dummy_cdkey_re, self.cdkey, contents)
dummy_medium_re = r'\bKVM_TEST_MEDIUM\b'
if self.medium == "cdrom":
@@ -290,67 +285,135 @@ class UnattendedInstallConfig(object):
else:
raise ValueError("Unexpected installation medium %s" % self.url)
- unattended_contents = re.sub(dummy_medium_re, content,
- unattended_contents)
+ contents = re.sub(dummy_medium_re, content, contents)
- def replace_virtio_key(contents, dummy_re, attribute_name):
- """
- Replace a virtio dummy string with contents.
+ logging.debug("Unattended install contents:")
+ for line in contents.splitlines():
+ logging.debug(line)
- If install_virtio is not set, replace it with a dummy string.
+ utils.open_write_close(answer_path, contents)
- @param contents: Contents of the unattended file
- @param dummy_re: Regular expression used to search on the.
- unattended file contents.
- @param env: Name of the environment variable.
- """
- dummy_path = "C:"
- driver = getattr(self, attribute_name, '')
- if re.search(dummy_re, contents):
- if self.install_virtio == "yes":
- if driver.endswith("msi"):
- driver = 'msiexec /passive /package ' + driver
- else:
- try:
- # Let's escape windows style paths properly
- drive, path = driver.split(":")
- driver = drive + ":" + re.escape(path)
- except:
- pass
- contents = re.sub(dummy_re, driver, contents)
- else:
- contents = re.sub(dummy_re, dummy_path, contents)
- return contents
-
- vdict = {r'\bKVM_TEST_STORAGE_DRIVER_PATH\b':
- 'virtio_storage_path',
- r'\bKVM_TEST_NETWORK_DRIVER_PATH\b':
- 'virtio_network_path',
- r'\bKVM_TEST_VIRTIO_NETWORK_INSTALLER\b':
- 'virtio_network_installer_path'}
-
- for vkey in vdict:
- unattended_contents = replace_virtio_key(
- contents=unattended_contents,
- dummy_re=vkey,
- attribute_name=vdict[vkey])
+ def answer_windows_ini(self, answer_path):
+ parser = ConfigParser.ConfigParser()
+ parser.read(self.unattended_file)
+ # First, replacing the CDKEY
+ if self.cdkey:
+ parser.set('UserData', 'ProductKey', self.cdkey)
+ else:
+ logging.error("Param 'cdkey' required but not specified for "
+ "this unattended installation")
+ # Now, replacing the virtio network driver path, under double quotes
+ if self.install_virtio == 'yes':
+ parser.set('Unattended', 'OemPnPDriversPath',
+ '"%s"' % self.virtio_nework_path)
+ else:
+ parser.remove_option('Unattended', 'OemPnPDriversPath')
+
+ # Last, replace the virtio installer command
+ if self.install_virtio == 'yes':
+ driver = self.virtio_network_installer_path
+ else:
+ driver = 'dir'
+
+ dummy_re = 'KVM_TEST_VIRTIO_NETWORK_INSTALLER'
+ installer = parser.get('GuiRunOnce', 'Command0')
+ if dummy_re in installer:
+ installer = re.sub(dummy_re, driver, installer)
+ parser.set('GuiRunOnce', 'Command0', installer)
+
+ # Now, writing the in memory config state to the unattended file
+ fp = open(answer_path, 'w')
+ parser.write(fp)
+
+ # Let's read it so we can debug print the contents
+ fp = open(answer_path, 'r')
+ contents = fp.read()
logging.debug("Unattended install contents:")
- for line in unattended_contents.splitlines():
+ for line in contents.splitlines():
logging.debug(line)
- return unattended_contents
+ fp.close()
- def setup_boot_disk(self):
- answer_contents = self.render_answer_file()
+ def answer_windows_xml(self, answer_path):
+ doc = xml.dom.minidom.parse(self.unattended_file)
+ if self.cdkey:
+ # First, replacing the CDKEY
+ product_key = doc.getElementsByTagName('ProductKey')[0]
+ key = product_key.getElementsByTagName('Key')[0]
+ key_text = key.childNodes[0]
+ assert key_text.nodeType == doc.TEXT_NODE
+ key_text.data = self.cdkey
+ else:
+ logging.error("Param 'cdkey' required but not specified for "
+ "this unattended installation")
+
+ # Now, replacing the virtio driver paths or removing the entire
+ # component PnpCustomizationsWinPE Element Node
+ if self.install_virtio == 'yes':
+ paths = doc.getElementsByTagName("Path")
+ values = [self.virtio_storage_path, self.virtio_nework_path]
+ for path, value in zip(paths, values):
+ path_text = path.childNodes[0]
+ assert key_text.nodeType == doc.TEXT_NODE
+ path_text.data = value
+ else:
+ settings = doc.getElementsByTagName("settings")
+ for s in settings:
+ for c in s.getElementsByTagName("component"):
+ if (c.getAttribute('name') ==
+ "Microsoft-Windows-PnpCustomizationsWinPE"):
+ s.removeChild(c)
+
+ # Last but not least important, replacing the virtio installer command
+ command_lines = doc.getElementsByTagName("CommandLine")
+ for command_line in command_lines:
+ command_line_text = command_line.childNodes[0]
+ assert command_line_text.nodeType == doc.TEXT_NODE
+ dummy_re = 'KVM_TEST_VIRTIO_NETWORK_INSTALLER'
+ if self.install_virtio == 'yes':
+ driver = self.virtio_network_installer_path
+ else:
+ driver = 'dir'
+ if driver.endswith("msi"):
+ driver = 'msiexec /passive /package ' + driver
+ if dummy_re in command_line_text.data:
+ t = command_line_text.data
+ t = re.sub(dummy_re, driver, t)
+ command_line_text.data = t
+
+ contents = doc.toxml()
+ logging.debug("Unattended install contents:")
+ for line in contents.splitlines():
+ logging.debug(line)
+
+ fp = open(answer_path, 'w')
+ doc.writexml(fp)
+
+
+ def answer_suse_xml(self, answer_path):
+ # There's nothing to replace on SUSE files to date. Yay!
+ doc = xml.dom.minidom.parse(self.unattended_file)
+
+ contents = doc.toxml()
+ logging.debug("Unattended install contents:")
+ for line in contents.splitlines():
+ logging.debug(line)
+
+ fp = open(answer_path, 'w')
+ doc.writexml(fp)
+
+
+ def setup_boot_disk(self):
if self.unattended_file.endswith('.sif'):
dest_fname = 'winnt.sif'
setup_file = 'winnt.bat'
boot_disk = FloppyDisk(self.floppy, self.qemu_img_binary,
self.tmpdir)
- boot_disk.setup_answer_file(dest_fname, answer_contents)
+ answer_path = boot_disk.get_answer_file_path(dest_fname)
+ self.answer_windows_ini(answer_path)
setup_file_path = os.path.join(self.unattended_dir, setup_file)
boot_disk.copy_to(setup_file_path)
if self.install_virtio == "yes":
@@ -369,7 +432,8 @@ class UnattendedInstallConfig(object):
else:
raise ValueError("Neither cdrom_unattended nor floppy set "
"on the config file, please verify")
- boot_disk.setup_answer_file(dest_fname, answer_contents)
+ answer_path = boot_disk.get_answer_file_path(dest_fname)
+ self.answer_kickstart(answer_path)
elif self.unattended_file.endswith('.xml'):
if "autoyast" in self.extra_params:
@@ -383,14 +447,17 @@ class UnattendedInstallConfig(object):
else:
raise ValueError("Neither cdrom_unattended nor floppy set "
"on the config file, please verify")
- boot_disk.setup_answer_file(dest_fname, answer_contents)
+ answer_path = boot_disk.get_answer_file_path(dest_fname)
+ self.answer_suse_xml(answer_path)
else:
# Windows unattended install
dest_fname = "autounattend.xml"
boot_disk = FloppyDisk(self.floppy, self.qemu_img_binary,
self.tmpdir)
- boot_disk.setup_answer_file(dest_fname, answer_contents)
+ answer_path = boot_disk.get_answer_file_path(dest_fname)
+ self.answer_windows_xml(answer_path)
+
if self.install_virtio == "yes":
boot_disk.setup_virtio_win2008(self.virtio_floppy)
boot_disk.copy_to(self.finish_program)
--
1.7.5.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/3] KVM test: Update Win2003 CD info to match MSDN registers
2011-07-01 8:01 [PATCH 0/3] KVM test: Windows install fixes Lucas Meneghel Rodrigues
2011-07-01 8:01 ` [PATCH 1/3] KVM test: Render unattended files more properly Lucas Meneghel Rodrigues
@ 2011-07-01 8:01 ` Lucas Meneghel Rodrigues
2011-07-01 8:01 ` [PATCH 3/3] KVM test: Reformat sample windows ini style unattended files Lucas Meneghel Rodrigues
2 siblings, 0 replies; 4+ messages in thread
From: Lucas Meneghel Rodrigues @ 2011-07-01 8:01 UTC (permalink / raw)
To: autotest; +Cc: kvm
Signed-off-by: Lucas Meneghel Rodrigues <lmr@redhat.com>
---
client/tests/kvm/tests_base.cfg.sample | 44 +++++++++++++++++++++++--------
1 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample
index bdc9b6c..5313da1 100644
--- a/client/tests/kvm/tests_base.cfg.sample
+++ b/client/tests/kvm/tests_base.cfg.sample
@@ -2317,17 +2317,27 @@ variants:
- 32:
image_name += -32
install:
- cdrom_cd1 = isos/windows/Windows2003_r2_VLK.iso
- md5sum_cd1 = 03e921e9b4214773c21a39f5c3f42ef7
- md5sum_1m_cd1 = 37c2fdec15ac4ec16aa10fdfdb338aa3
+ cdrom_cd1 = isos/windows/en_win_srv_2003_r2_enterprise_with_sp2_cd1_x13-05460.iso
+ md5sum_cd1 = 7c3bc891d20c7e6a110c4f1ad82952ba
+ md5sum_1m_cd1 = b1671ecf47a270e49e04982bf1474ff9
+ sha1sum_cd1 = ee11cc735c695501874d2fa123f7d78449b3de7c
+ sha1sum_1m_cd1 = e2d49dc3fbe17a6b2ba1812543f2cc08ef9565c4
+ #cdrom_cd1 = isos/windows/Windows2003_r2_VLK.iso
+ #md5sum_cd1 = 03e921e9b4214773c21a39f5c3f42ef7
+ #md5sum_1m_cd1 = 37c2fdec15ac4ec16aa10fdfdb338aa3
user = user
steps = Win2003-32.steps
setup:
steps = Win2003-32-rss.steps
unattended_install.cdrom, whql.support_vm_install:
- cdrom_cd1 = isos/windows/Windows2003_r2_VLK.iso
- md5sum_cd1 = 03e921e9b4214773c21a39f5c3f42ef7
- md5sum_1m_cd1 = 37c2fdec15ac4ec16aa10fdfdb338aa3
+ cdrom_cd1 = isos/windows/en_win_srv_2003_r2_enterprise_with_sp2_cd1_x13-05460.iso
+ md5sum_cd1 = 7c3bc891d20c7e6a110c4f1ad82952ba
+ md5sum_1m_cd1 = b1671ecf47a270e49e04982bf1474ff9
+ sha1sum_cd1 = ee11cc735c695501874d2fa123f7d78449b3de7c
+ sha1sum_1m_cd1 = e2d49dc3fbe17a6b2ba1812543f2cc08ef9565c4
+ #cdrom_cd1 = isos/windows/Windows2003_r2_VLK.iso
+ #md5sum_cd1 = 03e921e9b4214773c21a39f5c3f42ef7
+ #md5sum_1m_cd1 = 37c2fdec15ac4ec16aa10fdfdb338aa3
unattended_file = unattended/win2003-32.sif
floppy = images/win2003-32/answer.vfd
# Uncomment virtio_network_installer_path line if
@@ -2349,17 +2359,27 @@ variants:
- 64:
image_name += -64
install:
- cdrom_cd1 = isos/windows/Windows2003-x64.iso
- md5sum_cd1 = 5703f87c9fd77d28c05ffadd3354dbbd
- md5sum_1m_cd1 = 439393c384116aa09e08a0ad047dcea8
+ cdrom_cd1 = isos/windows/en_win_srv_2003_r2_enterprise_x64_with_sp2_cd1_x13-06188.iso
+ md5sum_cd1 = 09f4cb31796e9802dcc477e397868c9a
+ md5sum_1m_cd1 = c11ebcf6c128d94c83fe623566eb29d7
+ sha1sum_cd1 = d04c8f304047397be486c38a6b769f16993d4b39
+ sha1sum_1m_cd1 = 3daf6fafda8ba48779df65e4713a3cdbd6c9d136
+ #cdrom_cd1 = isos/windows/Windows2003-x64.iso
+ #md5sum_cd1 = 5703f87c9fd77d28c05ffadd3354dbbd
+ #md5sum_1m_cd1 = 439393c384116aa09e08a0ad047dcea8
user = user
steps = Win2003-64.steps
setup:
steps = Win2003-64-rss.steps
unattended_install.cdrom, whql.support_vm_install:
- cdrom_cd1 = isos/windows/Windows2003-x64.iso
- md5sum_cd1 = 5703f87c9fd77d28c05ffadd3354dbbd
- md5sum_1m_cd1 = 439393c384116aa09e08a0ad047dcea8
+ cdrom_cd1 = isos/windows/en_win_srv_2003_r2_enterprise_x64_with_sp2_cd1_x13-06188.iso
+ md5sum_cd1 = 09f4cb31796e9802dcc477e397868c9a
+ md5sum_1m_cd1 = c11ebcf6c128d94c83fe623566eb29d7
+ sha1sum_cd1 = d04c8f304047397be486c38a6b769f16993d4b39
+ sha1sum_1m_cd1 = 3daf6fafda8ba48779df65e4713a3cdbd6c9d136
+ #cdrom_cd1 = isos/windows/Windows2003-x64.iso
+ #md5sum_cd1 = 5703f87c9fd77d28c05ffadd3354dbbd
+ #md5sum_1m_cd1 = 439393c384116aa09e08a0ad047dcea8
unattended_file = unattended/win2003-64.sif
floppy = images/win2003-64/answer.vfd
# Uncomment virtio_network_installer_path line if
--
1.7.5.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 3/3] KVM test: Reformat sample windows ini style unattended files
2011-07-01 8:01 [PATCH 0/3] KVM test: Windows install fixes Lucas Meneghel Rodrigues
2011-07-01 8:01 ` [PATCH 1/3] KVM test: Render unattended files more properly Lucas Meneghel Rodrigues
2011-07-01 8:01 ` [PATCH 2/3] KVM test: Update Win2003 CD info to match MSDN registers Lucas Meneghel Rodrigues
@ 2011-07-01 8:01 ` Lucas Meneghel Rodrigues
2 siblings, 0 replies; 4+ messages in thread
From: Lucas Meneghel Rodrigues @ 2011-07-01 8:01 UTC (permalink / raw)
To: autotest; +Cc: kvm
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 <lmr@redhat.com>
---
client/tests/kvm/unattended/win2000-32.sif | 95 ++++++++++++++-------------
client/tests/kvm/unattended/win2003-32.sif | 78 +++++++++++-----------
client/tests/kvm/unattended/win2003-64.sif | 78 +++++++++++-----------
client/tests/kvm/unattended/winxp32.sif | 99 ++++++++++++++--------------
client/tests/kvm/unattended/winxp64.sif | 99 ++++++++++++++--------------
5 files changed, 225 insertions(+), 224 deletions(-)
diff --git a/client/tests/kvm/unattended/win2000-32.sif b/client/tests/kvm/unattended/win2000-32.sif
index 8720851..6aa1848 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"
+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
+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
+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=*
+ProductKey = KVM_TEST_CDKEY
+FullName = "Autotest Mindless Drone"
+OrgName = "Autotest"
+ComputerName = *
[Identification]
- JoinWorkgroup=WORKGROUP
+JoinWorkgroup = WORKGROUP
[Networking]
- InstallDefaultComponents=Yes
+InstallDefaultComponents = Yes
[Proxy]
- Proxy_Enable=0
- Use_Same_Proxy=0
+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
+dialer = off
+media_clips = off
+media_utopia = off
+msnexplr = off
+netoc = off
+OEAccess = off
+templates = off
+WMAccess = off
+zonegames = off
[TerminalServices]
- AllowConnections=1
+AllowConnections = 1
[WindowsFirewall]
- Profiles=WindowsFirewall.TurnOffFirewall
+Profiles = WindowsFirewall.TurnOffFirewall
[WindowsFirewall.TurnOffFirewall]
- Mode=0
+Mode = 0
[Branding]
- BrandIEUsingUnattended=Yes
+BrandIEUsingUnattended = Yes
[Display]
- Xresolution=1024
- YResolution=768
+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"
+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
index 207cd2b..6e69b5e 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
+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
+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
+AdminPassword = "1q2w3eP"
+AutoLogon = Yes
+AutoLogonCount = 1000
+OEMSkipRegional = 1
+TimeZone = 85
+OemSkipWelcome = 1
[UserData]
- ProductKey=KVM_TEST_CDKEY
- FullName="Autotest Mindless Drone"
- OrgName="Autotest"
- ComputerName=*
+ProductKey = KVM_TEST_CDKEY
+FullName = "Autotest Mindless Drone"
+OrgName = "Autotest"
+ComputerName = *
[LicenseFilePrintData]
- AutoMode=PerServer
- AutoUsers=15
+AutoMode = PerServer
+AutoUsers = 15
[Identification]
- JoinWorkgroup=WORKGROUP
+JoinWorkgroup = WORKGROUP
[Networking]
- InstallDefaultComponents=Yes
+InstallDefaultComponents = Yes
[Components]
[TerminalServices]
- AllowConnections = 1
+AllowConnections = 1
[WindowsFirewall]
- Profiles = WindowsFirewall.TurnOffFirewall
+Profiles = WindowsFirewall.TurnOffFirewall
[WindowsFirewall.TurnOffFirewall]
- Mode = 0
+Mode = 0
[SetupParams]
- local="Local Area Connection"
+local = "Local Area Connection"
[Display]
- Xresolution=1024
- YResolution=768
+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"
+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
index 207cd2b..6e69b5e 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
+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
+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
+AdminPassword = "1q2w3eP"
+AutoLogon = Yes
+AutoLogonCount = 1000
+OEMSkipRegional = 1
+TimeZone = 85
+OemSkipWelcome = 1
[UserData]
- ProductKey=KVM_TEST_CDKEY
- FullName="Autotest Mindless Drone"
- OrgName="Autotest"
- ComputerName=*
+ProductKey = KVM_TEST_CDKEY
+FullName = "Autotest Mindless Drone"
+OrgName = "Autotest"
+ComputerName = *
[LicenseFilePrintData]
- AutoMode=PerServer
- AutoUsers=15
+AutoMode = PerServer
+AutoUsers = 15
[Identification]
- JoinWorkgroup=WORKGROUP
+JoinWorkgroup = WORKGROUP
[Networking]
- InstallDefaultComponents=Yes
+InstallDefaultComponents = Yes
[Components]
[TerminalServices]
- AllowConnections = 1
+AllowConnections = 1
[WindowsFirewall]
- Profiles = WindowsFirewall.TurnOffFirewall
+Profiles = WindowsFirewall.TurnOffFirewall
[WindowsFirewall.TurnOffFirewall]
- Mode = 0
+Mode = 0
[SetupParams]
- local="Local Area Connection"
+local = "Local Area Connection"
[Display]
- Xresolution=1024
- YResolution=768
+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"
+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
index 4696e29..6aa1848 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"
+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
+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
+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=*
+ProductKey = KVM_TEST_CDKEY
+FullName = "Autotest Mindless Drone"
+OrgName = "Autotest"
+ComputerName = *
[Identification]
- JoinWorkgroup=WORKGROUP
+JoinWorkgroup = WORKGROUP
[Networking]
- InstallDefaultComponents=Yes
+InstallDefaultComponents = Yes
[Proxy]
- Proxy_Enable=0
- Use_Same_Proxy=0
+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
+dialer = off
+media_clips = off
+media_utopia = off
+msnexplr = off
+netoc = off
+OEAccess = off
+templates = off
+WMAccess = off
+zonegames = off
[TerminalServices]
- AllowConnections=1
+AllowConnections = 1
[WindowsFirewall]
- Profiles=WindowsFirewall.TurnOffFirewall
+Profiles = WindowsFirewall.TurnOffFirewall
[WindowsFirewall.TurnOffFirewall]
- Mode=0
+Mode = 0
[Branding]
- BrandIEUsingUnattended=Yes
+BrandIEUsingUnattended = Yes
[Display]
- Xresolution=1024
- YResolution=768
+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"
+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
index 4696e29..6aa1848 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"
+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
+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
+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=*
+ProductKey = KVM_TEST_CDKEY
+FullName = "Autotest Mindless Drone"
+OrgName = "Autotest"
+ComputerName = *
[Identification]
- JoinWorkgroup=WORKGROUP
+JoinWorkgroup = WORKGROUP
[Networking]
- InstallDefaultComponents=Yes
+InstallDefaultComponents = Yes
[Proxy]
- Proxy_Enable=0
- Use_Same_Proxy=0
+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
+dialer = off
+media_clips = off
+media_utopia = off
+msnexplr = off
+netoc = off
+OEAccess = off
+templates = off
+WMAccess = off
+zonegames = off
[TerminalServices]
- AllowConnections=1
+AllowConnections = 1
[WindowsFirewall]
- Profiles=WindowsFirewall.TurnOffFirewall
+Profiles = WindowsFirewall.TurnOffFirewall
[WindowsFirewall.TurnOffFirewall]
- Mode=0
+Mode = 0
[Branding]
- BrandIEUsingUnattended=Yes
+BrandIEUsingUnattended = Yes
[Display]
- Xresolution=1024
- YResolution=768
+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"
+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"
--
1.7.5.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-07-01 8:01 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-07-01 8:01 [PATCH 0/3] KVM test: Windows install fixes Lucas Meneghel Rodrigues
2011-07-01 8:01 ` [PATCH 1/3] KVM test: Render unattended files more properly Lucas Meneghel Rodrigues
2011-07-01 8:01 ` [PATCH 2/3] KVM test: Update Win2003 CD info to match MSDN registers Lucas Meneghel Rodrigues
2011-07-01 8:01 ` [PATCH 3/3] KVM test: Reformat sample windows ini style unattended files Lucas Meneghel Rodrigues
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.