Fix version check introduced in aca3e6508c7ae3f5ee

[snf-image-creator] / image_creator / os_type / windows.py

diff --git a/image_creator/os_type/windows.py b/image_creator/os_type/windows.py
index 4f427d6..96efdab 100644 (file)
--- 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)
 
@@ -208,7 +210,7 @@ class Windows(OSBase):
         """Install the appropriate KMS client setup key to the image to convert
         it to a KMS client. Computers that are running volume licensing
         editions of Windows 8, Windows Server 2012, Windows 7, Windows Server
-        2008 R2, Windows Vista, and Windows Server 2008 are, by default, KMS
+        2008 R2, Windows Vista, and Windows Server 2008 are by default KMS
         clients with no additional configuration needed.
         """
         try: