openkylin
/
virt-manager
mirror of https://gitee.com/openkylin/virt-manager.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

virt-install: Reorder --help output a bit

This commit is contained in:
Cole Robinson 2014-09-20 19:30:16 -04:00
parent d7e1a40352
commit 99700821c6
3 changed files with 36 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
virt-install
View File

@ -902,7 +902,6 @@ def parse_args():
cli.add_metadata_option(geng)
geng.add_argument("-u", "--uuid", help=argparse.SUPPRESS)
geng.add_argument("--description", help=argparse.SUPPRESS)
cli.add_guest_xml_options(geng)
insg = parser.add_argument_group(_("Installation Method Options"))
insg.add_argument("-c", dest="cdrom_short", help=argparse.SUPPRESS)
@ -922,9 +921,6 @@ def parse_args():
insg.add_argument("--initrd-inject", action="append",
help=_("Add given file to root of initrd from --location"))
# Way back when, we required specifying both --os-type and --os-variant
# Nowadays the distinction is pointless, so hide the less useful
# --os-type option.
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 guests, "
@ -933,43 +929,41 @@ def parse_args():
cli.add_boot_options(insg)
insg.add_argument("--init", help=argparse.SUPPRESS)
stog = parser.add_argument_group(_("Storage Configuration"))
cli.add_disk_option(stog)
stog.add_argument("--nodisks", action="store_true", help=argparse.SUPPRESS)
cli.add_fs_option(stog)
# Deprecated storage options
stog.add_argument("-f", "--file", dest="file_paths", action="append",
help=argparse.SUPPRESS)
stog.add_argument("-s", "--file-size", type=float,
action="append", dest="disksize",
help=argparse.SUPPRESS)
stog.add_argument("--nonsparse", action="store_false",
default=True, dest="sparse",
help=argparse.SUPPRESS)
vncg = parser.add_argument_group(_("Graphics Configuration"))
cli.add_gfx_option(vncg)
vncg.add_argument("--vnc", action="store_true", help=argparse.SUPPRESS)
vncg.add_argument("--vncport", type=int, help=argparse.SUPPRESS)
vncg.add_argument("--vnclisten", help=argparse.SUPPRESS)
vncg.add_argument("-k", "--keymap", help=argparse.SUPPRESS)
vncg.add_argument("--sdl", action="store_true", help=argparse.SUPPRESS)
vncg.add_argument("--nographics", action="store_true",
help=argparse.SUPPRESS)
netg = parser.add_argument_group(_("Networking Configuration"))
cli.add_net_option(netg)
netg.add_argument("--nonetworks", action="store_true",
help=argparse.SUPPRESS)
netg.add_argument("-b", "--bridge", action="append",
help=argparse.SUPPRESS)
netg.add_argument("-m", "--mac", action="append",
help=argparse.SUPPRESS)
devg = parser.add_argument_group(_("Device Options"))
cli.add_disk_option(devg)
cli.add_net_option(devg)
cli.add_gfx_option(devg)
cli.add_device_options(devg, sound_back_compat=True)
# Deprecated device options
devg.add_argument("-f", "--file", dest="file_paths", action="append",
help=argparse.SUPPRESS)
devg.add_argument("-s", "--file-size", type=float,
action="append", dest="disksize",
help=argparse.SUPPRESS)
devg.add_argument("--nonsparse", action="store_false",
default=True, dest="sparse",
help=argparse.SUPPRESS)
devg.add_argument("--nodisks", action="store_true", help=argparse.SUPPRESS)
devg.add_argument("--nonetworks", action="store_true",
help=argparse.SUPPRESS)
devg.add_argument("-b", "--bridge", action="append",
help=argparse.SUPPRESS)
devg.add_argument("-m", "--mac", action="append", help=argparse.SUPPRESS)
devg.add_argument("--vnc", action="store_true", help=argparse.SUPPRESS)
devg.add_argument("--vncport", type=int, help=argparse.SUPPRESS)
devg.add_argument("--vnclisten", help=argparse.SUPPRESS)
devg.add_argument("-k", "--keymap", help=argparse.SUPPRESS)
devg.add_argument("--sdl", action="store_true", help=argparse.SUPPRESS)
devg.add_argument("--nographics", action="store_true",
help=argparse.SUPPRESS)
gxmlg = parser.add_argument_group(_("Guest Configuration Options"))
cli.add_guest_xml_options(gxmlg)
virg = parser.add_argument_group(_("Virtualization Platform Options"))
virg.add_argument("-v", "--hvm", action="store_true", dest="fullvirt",
help=_("This guest should be a fully virtualized guest"))

1
virt-xml
View File

@ -356,7 +356,6 @@ def parse_args():
cli.vcpu_cli_options(g, editexample=True)
cli.add_guest_xml_options(g)
cli.add_boot_options(g)
cli.add_fs_option(g)
cli.add_device_options(g)
misc = parser.add_argument_group(_("Miscellaneous Options"))

12
virtinst/cli.py
View File

@ -571,6 +571,11 @@ def add_device_options(devg, sound_back_compat=False):
devg.add_argument("--hostdev", action="append",
help=_("Configure physical USB/PCI/etc host devices "
"to be shared with the guest"))
devg.add_argument("--filesystem", action="append",
help=_("Pass host directory to the guest. Ex: \n"
"--filesystem /my/source/dir,/dir/in/guest\n"
"--filesystem template_name,/,type=template"))
# Back compat name
devg.add_argument("--host-device", action="append", dest="hostdev",
help=argparse.SUPPRESS)
@ -611,13 +616,6 @@ def add_device_options(devg, sound_back_compat=False):
"--panic default"))
def add_fs_option(devg):
devg.add_argument("--filesystem", action="append",
help=_("Pass host directory to the guest. Ex: \n"
"--filesystem /my/source/dir,/dir/in/guest\n"
"--filesystem template_name,/,type=template"))
def add_guest_xml_options(geng):
geng.add_argument("--security",
help=_("Set domain security driver configuration."))