X-Git-Url: https://code.grnet.gr/git/snf-image-creator/blobdiff_plain/f59ad9138b4413e6ec3b6256dade32cba1828507..5756c277d37278acc102b64d4493c040aabf38e1:/image_creator/os_type/windows.py diff --git a/image_creator/os_type/windows.py b/image_creator/os_type/windows.py index b93e539..4f427d6 100644 --- a/image_creator/os_type/windows.py +++ b/image_creator/os_type/windows.py @@ -37,7 +37,7 @@ Windows OSs.""" from image_creator.os_type import OSBase, sysprep, add_sysprep_param -from image_creator.util import FatalError, check_guestfs_version, get_command +from image_creator.util import FatalError, get_kvm_binary from image_creator.winexe import WinEXE, WinexeTimeout import hivex @@ -50,10 +50,6 @@ import string import subprocess import struct -BOOT_TIMEOUT = 300 -SHUTDOWN_TIMEOUT = 120 -CONNECTION_RETRIES = 5 - # For more info see: http://technet.microsoft.com/en-us/library/jj612867.aspx KMS_CLIENT_SETUP_KEYS = { "Windows 8 Professional": "NG4HW-VH26C-733KW-K6F98-J8CK4", @@ -104,29 +100,51 @@ KMS_CLIENT_SETUP_KEYS = { "Windows Server 2008 for Itanium-Based Systems": "4DWFP-JF3DJ-B7DTH-78FJB-PDRHK"} +_POSINT = lambda x: type(x) == int and x >= 0 + class Windows(OSBase): """OS class for Windows""" - - @add_sysprep_param('password', 'Image Administrator Password', 20) + @add_sysprep_param( + 'shutdown_timeout', int, 120, "Shutdown Timeout (seconds)", _POSINT) + @add_sysprep_param( + 'boot_timeout', int, 300, "Boot Timeout (seconds)", _POSINT) + @add_sysprep_param( + 'connection_retries', int, 5, "Connection Retries", _POSINT) + @add_sysprep_param('password', str, None, 'Image Administrator Password') def __init__(self, image, **kargs): super(Windows, self).__init__(image, **kargs) - device = self.g.part_to_dev(self.root) - - self.last_part_num = self.g.part_list(device)[-1]['part_num'] + # The commit with the following message was added in + # libguestfs 1.17.18: + # + # When a Windows guest doesn't have a HKLM\SYSTEM\MountedDevices node, + # inspection fails. However inspection should not completely fail just + # because we cannot get the drive letter mapping from a guest. + # + # Since Microsoft Sysprep removes the aforementioned key, image + # creation for windows can only be supported if the installed guestfs + # version is 1.17.18 or higher + if self.image.check_guestfs_version(1, 17, 18) < 0: + raise FatalError( + 'For windows support libguestfs 1.17.18 or above is required') + + device = self.image.g.part_to_dev(self.root) + + self.last_part_num = self.image.g.part_list(device)[-1]['part_num'] self.last_drive = None self.system_drive = None - for drive, partition in self.g.inspect_get_drive_mappings(self.root): - if partition == "%s%d" % (device, self.last_part_num): + for drive, part in self.image.g.inspect_get_drive_mappings(self.root): + if part == "%s%d" % (device, self.last_part_num): self.last_drive = drive - if partition == self.root: + if part == self.root: self.system_drive = drive assert self.system_drive - self.product_name = self.g.inspect_get_product_name(self.root) + self.product_name = self.image.g.inspect_get_product_name(self.root) + self.syspreped = False @sysprep('Disabling IPv6 privacy extensions') def disable_ipv6_privacy_extensions(self): @@ -202,7 +220,7 @@ class Windows(OSBase): return self._guest_exec( - "cscript \Windows\system32\slmgr.vbs /ipk %s" % setup_key) + r"cscript \Windows\system32\slmgr.vbs /ipk %s" % setup_key) @sysprep('Shrinking the last filesystem') def shrink(self): @@ -260,8 +278,12 @@ class Windows(OSBase): r'IF NOT !ERRORLEVEL! EQU 0 EXIT /B 1 & ' + r'DEL /Q %SCRIPT%"') - stdout, stderr, rc = self._guest_exec(cmd) + stdout, stderr, rc = self._guest_exec(cmd, False) + if rc != 0: + FatalError("Shrinking failed. Please make sure the media is " + "defraged with a command like this: " + "`Defrag.exe /U /X /W'") for line in stdout.splitlines(): if line.find('shrunk') >= 0: self.out.output(line) @@ -273,9 +295,9 @@ class Windows(OSBase): raise FatalError("Image is already syspreped!") txt = "System preparation parameter: `%s' is needed but missing!" - for param in self.needed_sysprep_params: - if param not in self.sysprep_params: - raise FatalError(txt % param) + for name, param in self.needed_sysprep_params.items(): + if name not in self.sysprep_params: + raise FatalError(txt % name) self.mount(readonly=False) try: @@ -286,23 +308,17 @@ class Windows(OSBase): firewall_states = self._update_firewalls(0, 0, 0) # Delete the pagefile. It will be recreated when the system boots - systemroot = self.g.inspect_get_windows_systemroot(self.root) - pagefile = "%s/pagefile.sys" % systemroot - self.g.rm_rf(self.g.case_sensitive_path(pagefile)) + systemroot = self.image.g.inspect_get_windows_systemroot(self.root) + try: + pagefile = "%s/pagefile.sys" % systemroot + self.image.g.rm_rf(self.image.g.case_sensitive_path(pagefile)) + except RuntimeError: + pass finally: self.umount() - self.out.output("Shutting down helper VM ...", False) - self.g.sync() - # guestfs_shutdown which is the prefered way to shutdown the backend - # process was introduced in version 1.19.16 - if check_guestfs_version(self.g, 1, 19, 16) >= 0: - ret = self.g.shutdown() - else: - ret = self.g.kill_subprocess() - - self.out.success('done') + self.image.disable_guestfs() vm = None monitor = None @@ -310,7 +326,7 @@ class Windows(OSBase): self.out.output("Starting windows VM ...", False) monitorfd, monitor = tempfile.mkstemp() os.close(monitorfd) - vm = _VM(self.image.device, monitor) + vm = _VM(self.image.device, monitor, self.sysprep_params) self.out.success("started (console on vnc display: %d)." % vm.display) @@ -329,22 +345,19 @@ class Windows(OSBase): self.out.output('Preparing system for image creation:') tasks = self.list_syspreps() - enabled = filter(lambda x: x.enabled, tasks) + enabled = [task for task in tasks if task.enabled] size = len(enabled) # Make sure shrink runs in the end, before ms sysprep - enabled = filter(lambda x: self.sysprep_info(x).name != 'shrink', - enabled) + enabled = [task for task in enabled if + self.sysprep_info(task).name != 'shrink'] - shrink_enabled = False if len(enabled) != size: enabled.append(self.shrink) - shrink_enabled = True # Make sure the ms sysprep is the last task to run if it is enabled - enabled = filter( - lambda x: self.sysprep_info(x).name != 'microsoft-sysprep', - enabled) + enabled = [task for task in enabled if + self.sysprep_info(task).name != 'microsoft-sysprep'] ms_sysprep_enabled = False if len(enabled) != size: @@ -364,7 +377,7 @@ class Windows(OSBase): self.out.success("done") self.out.output("Waiting for windows to shut down ...", False) - vm.wait(SHUTDOWN_TIMEOUT) + vm.wait(self.sysprep_params['shutdown_timeout']) self.out.success("done") finally: if monitor is not None: @@ -376,10 +389,7 @@ class Windows(OSBase): vm.destroy() self.out.success("done") finally: - self.out.output("Relaunching helper VM (may take a while) ...", - False) - self.g.launch() - self.out.success('done') + self.image.enable_guestfs() self.mount(readonly=False) try: @@ -397,7 +407,7 @@ class Windows(OSBase): def _wait_vm_boot(self, vm, fname, msg): """Wait until a message appears on a file or the vm process dies""" - for i in range(BOOT_TIMEOUT): + for _ in range(self.sysprep_params['boot_timeout']): time.sleep(1) with open(fname) as f: for line in f: @@ -421,13 +431,13 @@ class Windows(OSBase): def _registry_file_path(self, regfile): """Retrieves the case sensitive path to a registry file""" - systemroot = self.g.inspect_get_windows_systemroot(self.root) + systemroot = self.image.g.inspect_get_windows_systemroot(self.root) path = "%s/system32/config/%s" % (systemroot, regfile) try: - path = self.g.case_sensitive_path(path) - except RuntimeError as e: + path = self.image.g.case_sensitive_path(path) + except RuntimeError as error: raise FatalError("Unable to retrieve registry file: %s. Reason: %s" - % (regfile, str(e))) + % (regfile, str(error))) return path def _enable_os_monitor(self): @@ -441,7 +451,7 @@ class Windows(OSBase): softwarefd, software = tempfile.mkstemp() try: os.close(softwarefd) - self.g.download(path, software) + self.image.g.download(path, software) h = hivex.Hivex(software, write=True) @@ -506,7 +516,7 @@ class Windows(OSBase): h.commit(None) - self.g.upload(software, path) + self.image.g.upload(software, path) finally: os.unlink(software) @@ -532,7 +542,7 @@ class Windows(OSBase): systemfd, system = tempfile.mkstemp() try: os.close(systemfd) - self.g.download(path, system) + self.image.g.download(path, system) h = hivex.Hivex(system, write=True) @@ -564,7 +574,7 @@ class Windows(OSBase): 'value': struct.pack("