shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2024-12-22 13:34:07 +03:00
Code Issues Projects Releases Wiki Activity

virt-install: Add --install no_install=yes|no

Browse Source 
This just formalizes the behavior of things like --import and
--livecd
This commit is contained in:
Cole Robinson 2019-06-16 23:12:24 -04:00
parent 230545bdb3
commit 16362671e9
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/clitest.py
View File

@ -837,6 +837,7 @@ c.add_invalid("--os-variant foo://bar", grep="Unknown libosinfo ID") # bad full
c = vinst.add_category("single-disk-install", "--nographics --noautoconsole --disk %(EXISTIMG1)s")
c.add_valid("--hvm --import") # FV Import install
c.add_valid("--hvm --install no_install=yes") # import install equivalent
c.add_valid("--hvm --import --prompt --force") # Working scenario w/ prompt shouldn't ask anything
c.add_valid("--paravirt --import") # PV Import install
c.add_valid("--paravirt --print-xml 1") # print single XML, implied import install
@ -1019,6 +1020,7 @@ c.add_valid("--disk %(EXISTIMG1)s --location %(TREEDIR)s --paravirt --graphics n
c.add_compare("--disk %(EXISTIMG1)s --import", "xen-default") # Xen default
c.add_compare("--disk %(EXISTIMG1)s --location %(TREEDIR)s --paravirt --controller xenbus,maxGrantFrames=64 --input default", "xen-pv", precompare_check="5.3.0") # Xen PV
c.add_compare("--disk /iscsi-pool/diskvol1 --cdrom %(EXISTIMG1)s --livecd --hvm", "xen-hvm") # Xen HVM
c.add_compare("--disk /iscsi-pool/diskvol1 --cdrom %(EXISTIMG1)s --install no_install=yes --hvm", "xen-hvm") # Ensure --livecd and --install no_install are essentially identical

2
virt-install
View File

@ -398,13 +398,13 @@ def build_installer(options, guest, installdata):
install_initrd = installdata.initrd
install_kernel_args = installdata.kernel_args
install_os = installdata.os
no_install = installdata.no_install
if installdata.kernel_args:
if installdata.kernel_args_overwrite:
install_kernel_args = installdata.kernel_args
else:
extra_args = [installdata.kernel_args]
no_install = None
if install_os:
location = get_location_for_os(guest, install_os)
elif options.location:

2
virtinst/cli.py
View File

@ -1579,6 +1579,7 @@ class ParserInstall(VirtCLIParser):
cls.add_arg("kernel_args_overwrite", "kernel_args_overwrite",
is_onoff=True)
cls.add_arg("os", "os")
cls.add_arg("no_install", "no_install", is_onoff=True)
class InstallData:
@ -1590,6 +1591,7 @@ class InstallData:
self.kernel_args_overwrite = None
self.os = None
self.is_set = False
self.no_install = None
def parse_install(optstr):