From 876da431c26216844488b8fe11be871576b7751d Mon Sep 17 00:00:00 2001
Message-Id: <876da431c26216844488b8fe11be871576b7751d@dist-git>
From: Pavel Hrdina <phrdina@redhat.com>
Date: Tue, 13 Nov 2018 16:18:05 +0100
Subject: [PATCH] virt-install: Add "Guest OS" options group

From: Andrea Bolognani <abologna@redhat.com>

The --os-variant option doesn't quite fit perfectly into
its current "Installation method" group, plus we want to
add the same option to virt-xml which can't have that
group for obvious reasons.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
(cherry picked from commit 751fb88c58b0e1d922b11397bcfe3cd91af694f0)

https://bugzilla.redhat.com/show_bug.cgi?id=1649406

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---
 man/virt-install.pod | 38 +++++++++++++++++++++++---------------
 virt-install         | 10 +++++-----
 2 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/man/virt-install.pod b/man/virt-install.pod
index b75b7998..5b7a784c 100644
--- a/man/virt-install.pod
+++ b/man/virt-install.pod
@@ -472,21 +472,6 @@ file:
 
 --initrd-inject=/path/to/my.ks --extra-args "ks=file:/my.ks"
 
-=item B<--os-variant> OS_VARIANT
-
-Optimize the guest configuration for a specific operating system (ex.
-'fedora29', 'rhel7', 'win10'). While not required, specifying this
-options is HIGHLY RECOMMENDED, as it can greatly increase performance
-by specifying virtio among other guest tweaks.
-
-By default, virt-install will attempt to auto detect this value from
-the install media (currently only supported for URL installs). Autodetection
-can be disabled with the special value 'none'. Autodetection can be
-forced with the special value 'auto'.
-
-Use the command "osinfo-query os" to get the list of the accepted OS
-variants.
-
 =item B<--boot> BOOTOPTS
 
 Optionally specify the post-install VM boot configuration. This option allows
@@ -573,6 +558,29 @@ Use --idmap=? to see a list of all available sub options. Complete details at L<
 
 
 
+=head1 GUEST OS OPTIONS
+
+=over 4
+
+=item B<--os-variant> OS_VARIANT
+
+Optimize the guest configuration for a specific operating system (ex.
+'fedora29', 'rhel7', 'win10'). While not required, specifying this
+options is HIGHLY RECOMMENDED, as it can greatly increase performance
+by specifying virtio among other guest tweaks.
+
+By default, virt-install will attempt to auto detect this value from
+the install media (currently only supported for URL installs). Autodetection
+can be disabled with the special value 'none'. Autodetection can be
+forced with the special value 'auto'.
+
+Use the command "osinfo-query os" to get the list of the accepted OS
+variants.
+
+=back
+
+
+
 
 =head1 STORAGE OPTIONS
 
diff --git a/virt-install b/virt-install
index 2c379ed3..4e16d4c8 100755
--- a/virt-install
+++ b/virt-install
@@ -784,14 +784,14 @@ def parse_args():
     insg.add_argument("--test-stub-command", action="store_true",
             help=argparse.SUPPRESS)
 
-    insg.add_argument("--os-type", dest="distro_type", help=argparse.SUPPRESS)
-    insg.add_argument("--os-variant", dest="distro_variant",
-        help=_("The OS variant being installed in the guest, "
-               "e.g. 'fedora29', 'rhel7', 'win10 etc."))
-
     cli.add_boot_options(insg)
     insg.add_argument("--init", help=argparse.SUPPRESS)
 
+    osg = parser.add_argument_group(_("Guest OS Options"))
+    osg.add_argument("--os-type", dest="distro_type", help=argparse.SUPPRESS)
+    osg.add_argument("--os-variant", dest="distro_variant",
+        help=_("The OS variant being installed in the guest, "
+               "e.g. 'fedora29', 'rhel7', 'win10 etc."))
 
     devg = parser.add_argument_group(_("Device Options"))
     cli.add_disk_option(devg)
-- 
2.19.2