Set Guest.os_variant if detect from install media (and user doesn't override).

Author: crobinso

virtinst/DistroInstaller.py

@@ -176,13 +176,20 @@ def _prepare_kernel_and_initrd(self, guest, distro, meter):
             # Need to fetch the kernel & initrd from a remote site, or
             # out of a loopback mounted disk image/device
 
-            (kernelfn, initrdfn, args), os_type = OSDistro.acquireKernel(guest,
+            ((kernelfn, initrdfn, args),
+             os_type, os_variant) = OSDistro.acquireKernel(guest,
                 self.location, meter, guest.arch, scratchdir=self.scratchdir,
                 type=self.os_type, distro=distro)
 
             # Only set OS type if the user didn't explictly pass one
+            # XXX: Should this be opt in?
             if guest.os_type == None and os_type:
+                logging.debug("Auto detected OS type as: %s" % os_type)
                 guest.os_type = os_type
+            if (guest.os_variant == None and os_variant
+                and guest.os_type == os_type):
+                logging.debug("Auto detected OS variant as: %s" % os_variant)
+                guest.os_variant = os_variant
 
             self.install["kernel"] = kernelfn
             self.install["initrd"] = initrdfn

virtinst/OSDistro.py

@@ -114,8 +114,10 @@ def _acquireMedia(iskernel, guest, baseuri, progresscb, arch,
                                 scratchdir=scratchdir, arch=arch)
 
         if iskernel is True:
+            # FIXME: We should probably do this for both kernel and boot
+            # disk?
             return (store.acquireKernel(guest, fetcher, progresscb),
-                    store.os_type)
+                    store.os_type, store.os_variant)
         elif iskernel is False:
             return store.acquireBootDisk(fetcher, progresscb)
         else: