If we use "--boot init=INITPATH" style to set

container's init, virt-install will complain:

"ERROR    Install methods (--location URL,
--cdrom CD/ISO, --pxe, --import, --boot hd|cdrom|...)
cannot be specified for container guests"

This patch will fix this bug.

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
This commit is contained in:
Chen Hanxiao 2014-02-03 19:03:21 +08:00
parent 4ade419002
commit ad05b19f20

View File

@ -541,13 +541,13 @@ def build_installer(options, conn, virt_type):
instclass = virtinst.PXEInstaller
elif options.cdrom or options.location:
instclass = virtinst.DistroInstaller
elif virt_type == "exe":
instclass = virtinst.ContainerInstaller
elif options.import_install or options.boot:
if options.import_install and options.nodisks:
fail(_("A disk device must be specified with --import."))
options.import_install = True
instclass = virtinst.ImportInstaller
elif virt_type == "exe":
instclass = virtinst.ContainerInstaller
else:
instclass = virtinst.DistroInstaller