Revision 981b4504 image_creator/os_type/windows.py

b/image_creator/os_type/windows.py
116 116
        super(Windows, self).__init__(image, **kargs)
117 117

  
118 118
        # The commit with the following message was added in
119
        # libguestfs 1.17.18:
119
        # libguestfs 1.17.18 and was backported in version 1.16.11:
120 120
        #
121 121
        # When a Windows guest doesn't have a HKLM\SYSTEM\MountedDevices node,
122 122
        # inspection fails.  However inspection should not completely fail just
......
125 125
        # Since Microsoft Sysprep removes the aforementioned key, image
126 126
        # creation for windows can only be supported if the installed guestfs
127 127
        # version is 1.17.18 or higher
128
        if self.image.check_guestfs_version(1, 17, 18) < 0:
128
        if self.image.check_guestfs_version(1, 17, 18) < 0 and \
129
                (self.image.check_guestfs_version(1, 17, 0) >= 0 or
130
                 self.image.check_guestfs_version(1, 16, 11) < 0):
129 131
            raise FatalError(
130
                'For windows support libguestfs 1.17.18 or above is required')
132
                'For windows support libguestfs 1.16.11 or above is required')
131 133

  
132 134
        device = self.image.g.part_to_dev(self.root)
133 135

  

Also available in: Unified diff