virt-install: Respect --os-variant

When the user explicitly passes --os-variant via command line, its value
must be respected, always.

By setting the os name earlier, we force the os-variant to be respected
when the installer creates the Distro Store.

Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>

1 files changed, 8 insertions, 5 deletions

diff --git a/virt-install b/virt-install
index 82b7e537..3b4ecd2f 100755
--- a/virt-install
+++ b/virt-install
@@ -531,13 +531,16 @@ def set_explicit_guest_options(options, guest):
 
 def installer_detect_distro(guest, installer, osdata):
     try:
+        # OS name has to be set firstly whenever --os-variant is passed,
+        # otherwise it won't be respected when the installer creates the
+        # Distro Store.
+        if osdata.name:
+            guest.set_os_name(osdata.name)
+
         # This also validates the install location
         autodistro = installer.detect_distro(guest)
-        name = osdata.name
-        if osdata.is_auto:
-            name = autodistro
-        if name:
-            guest.set_os_name(name)
+        if osdata.is_auto and autodistro:
+            guest.set_os_name(autodistro)
     except ValueError as e:
         fail(_("Error validating install location: %s") % str(e))