From 8f6d08a40183206b2a74679e7ea8d7f54fdef630 Mon Sep 17 00:00:00 2001
In-Reply-To: <f3ffd487a2c5ee4f417e9fe8c29c43bc96fd6022.1439295126.git.phrdina@redhat.com>
References: <f3ffd487a2c5ee4f417e9fe8c29c43bc96fd6022.1439295126.git.phrdina@redhat.com>
From: Pavel Hrdina <phrdina@redhat.com>
Date: Thu, 6 Aug 2015 14:43:00 +0200
Subject: [PATCH 6/7] virt-install: report an error for pxe install without
 network

Fix a regression where we used to report an error message if user
specified pxe installation without any network (--nonetworks or
--network none).

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1250382

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
(cherry picked from commit aebebbf879ff33af38f858aebc01a5de1cafb1a7)
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
---
 tests/clitest.py | 2 +-
 virt-install     | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/clitest.py b/tests/clitest.py
index 056ec4a..5ce7355 100644
--- a/tests/clitest.py
+++ b/tests/clitest.py
@@ -742,8 +742,8 @@ c.add_valid("--mac 22:22:33:44:55:AF")  # Just a macaddr
 c.add_valid("--bridge mybr0 --mac 22:22:33:44:55:AF")  # Old bridge w/ mac
 c.add_valid("--network bridge:mybr0,model=e1000")  # --network bridge:
 c.add_valid("--network network:default --mac RANDOM")  # VirtualNetwork with a random macaddr
-c.add_valid("--nonetworks")  # no networks
 c.add_valid("--vnc --keymap=local")  # --keymap local
+c.add_invalid("--nonetworks")  # no networks
 c.add_invalid("--graphics vnc --vnclisten 1.2.3.4")  # mixing old and new
 c.add_invalid("--network=FOO")  # Nonexistent network
 c.add_invalid("--mac 1234")  # Invalid mac
diff --git a/virt-install b/virt-install
index 6894654..0e6e750 100755
--- a/virt-install
+++ b/virt-install
@@ -226,6 +226,9 @@ def convert_old_networks(options):
             fail(_("Cannot use --nonetworks with --network"))
         options.network = ["none"]
 
+    if options.pxe and options.network and "none" in options.network:
+        fail(_("Can't use --pxe without any network"))
+
     macs = virtinst.util.listify(options.mac)
     networks = virtinst.util.listify(options.network)
     bridges = virtinst.util.listify(options.bridge)
-- 
2.5.0