c7dfc18daa
8dbe96fc-add-s390x-arch-support.patch virtman-s390x-dont-add-graphics-support.patch Drop virtman-add-s390x-arch-support.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=259
42 lines
1.9 KiB
Diff
42 lines
1.9 KiB
Diff
Subject: virt-install: report an error for pxe install without network
|
|
From: Pavel Hrdina phrdina@redhat.com Thu Aug 6 14:43:00 2015 +0200
|
|
Date: Thu Aug 6 14:56:30 2015 +0200:
|
|
Git: aebebbf879ff33af38f858aebc01a5de1cafb1a7
|
|
|
|
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>
|
|
|
|
Index: virt-manager-1.2.1/tests/clitest.py
|
|
===================================================================
|
|
--- virt-manager-1.2.1.orig/tests/clitest.py
|
|
+++ virt-manager-1.2.1/tests/clitest.py
|
|
@@ -746,8 +746,8 @@ c.add_valid("--mac 22:22:33:44:55:AF")
|
|
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
|
|
Index: virt-manager-1.2.1/virt-install
|
|
===================================================================
|
|
--- virt-manager-1.2.1.orig/virt-install
|
|
+++ virt-manager-1.2.1/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)
|