diff options
-rwxr-xr-x | virt-install | 5 | ||||
-rwxr-xr-x | virt-xml | 5 | ||||
-rw-r--r-- | virtinst/cli.py | 16 |
3 files changed, 18 insertions, 8 deletions
diff --git a/virt-install b/virt-install index a28bfdf3..1984688b 100755 --- a/virt-install +++ b/virt-install @@ -791,11 +791,8 @@ def parse_args(): cli.add_boot_options(insg) insg.add_argument("--init", help=argparse.SUPPRESS) - osg = parser.add_argument_group(_("Guest OS Options")) + osg = cli.add_os_variant_option(parser, virtinstall=True) 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) @@ -373,10 +373,7 @@ def parse_args(): outg.add_argument("--confirm", action="store_true", help=_("Require confirmation before saving any results.")) - osg = parser.add_argument_group(_("OS options")) - osg.add_argument("--os-variant", dest="distro_variant", - help=_("The OS variant installed in the guest, " - "e.g. 'fedora29', 'rhel7', 'win10 etc.")) + cli.add_os_variant_option(parser, virtinstall=False) g = parser.add_argument_group(_("XML options")) cli.add_disk_option(g, editexample=True) diff --git a/virtinst/cli.py b/virtinst/cli.py index db959619..7f62a204 100644 --- a/virtinst/cli.py +++ b/virtinst/cli.py @@ -845,6 +845,22 @@ def add_disk_option(stog, editexample=False): "--disk=?") + editmsg) +def add_os_variant_option(parser, virtinstall): + osg = parser.add_argument_group(_("OS options")) + + if virtinstall: + msg = _("The OS being installed in the guest.") + else: + msg = _("The OS installed in the guest.") + msg += "\n" + msg += _("This is used for deciding optimal defaults like virtio.\n" + "Example values: fedora29, rhel7.0, win10, ...\n" + "See 'osinfo-query os' for a full list.") + + osg.add_argument("--os-variant", dest="distro_variant", help=msg) + return osg + + ############################################# # CLI complex parsing helpers # # (for options like --disk, --network, etc. # |