From 981b450428a56442f3bd034d9e5c951f87117625 Mon Sep 17 00:00:00 2001 From: Nikos Skalkotos Date: Sun, 4 Aug 2013 16:12:40 +0300 Subject: [PATCH] Fix version check introduced in aca3e6508c7ae3f5ee The fix was backported to version 1.16.11 --- image_creator/os_type/windows.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/image_creator/os_type/windows.py b/image_creator/os_type/windows.py index a82f510..96efdab 100644 --- a/image_creator/os_type/windows.py +++ b/image_creator/os_type/windows.py @@ -116,7 +116,7 @@ class Windows(OSBase): super(Windows, self).__init__(image, **kargs) # The commit with the following message was added in - # libguestfs 1.17.18: + # libguestfs 1.17.18 and was backported in version 1.16.11: # # When a Windows guest doesn't have a HKLM\SYSTEM\MountedDevices node, # inspection fails. However inspection should not completely fail just @@ -125,9 +125,11 @@ class Windows(OSBase): # 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: + if self.image.check_guestfs_version(1, 17, 18) < 0 and \ + (self.image.check_guestfs_version(1, 17, 0) >= 0 or + self.image.check_guestfs_version(1, 16, 11) < 0): raise FatalError( - 'For windows support libguestfs 1.17.18 or above is required') + 'For windows support libguestfs 1.16.11 or above is required') device = self.image.g.part_to_dev(self.root) -- 1.7.10.4