From ad05b19f2023b8c80b1b89af328c0f72ab8512df Mon Sep 17 00:00:00 2001
From: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
Date: Mon, 3 Feb 2014 19:03:21 +0800
Subject: [PATCH] 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>
---
 virt-install | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/virt-install b/virt-install
index 3692a96e6..614a37df9 100755
--- a/virt-install
+++ b/virt-install
@@ -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