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 690a569..96efdab 100644 (file)
--- a/image_creator/os_type/windows.py
+++ b/image_creator/os_type/windows.py
@@ -37,8 +37,7 @@
 Windows OSs."""
 
 from image_creator.os_type import OSBase, sysprep, add_sysprep_param
 Windows OSs."""
 
 from image_creator.os_type import OSBase, sysprep, add_sysprep_param

-from image_creator.util import FatalError, check_guestfs_version, \
-    get_kvm_binary
+from image_creator.util import FatalError, get_kvm_binary

 from image_creator.winexe import WinEXE, WinexeTimeout
 
 import hivex
 from image_creator.winexe import WinEXE, WinexeTimeout
 
 import hivex

@@ -116,15 +115,21 @@ class Windows(OSBase):
     def __init__(self, image, **kargs):
         super(Windows, self).__init__(image, **kargs)
 
     def __init__(self, image, **kargs):
         super(Windows, self).__init__(image, **kargs)
 

-        # This commit was added in libguestfs 1.17.18 and is critical because
-        # Microsoft Sysprep removes this key:
+        # The commit with the following message was added in
+        # 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
         # because we cannot get the drive letter mapping from a guest.
         #
         # 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.

-        if check_guestfs_version(self.image.g, 1, 17, 18) < 0:
+        #
+        # 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 and \
+                (self.image.check_guestfs_version(1, 17, 0) >= 0 or
+                 self.image.check_guestfs_version(1, 16, 11) < 0):

             raise FatalError(
             raise FatalError(

-                'For windows support libguestfs 1.17.18 or above is needed')
+                'For windows support libguestfs 1.16.11 or above is required')

 
         device = self.image.g.part_to_dev(self.root)
 
 
         device = self.image.g.part_to_dev(self.root)
 

@@ -205,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
         """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:
         clients with no additional configuration needed.
         """
         try: