|
 |
ca5a13e |
# HG changeset patch
|
|
|
ca5a13e |
# User "Cole Robinson <crobinso@redhat.com>"
|
|
|
ca5a13e |
# Date 1226346838 18000
|
|
|
ca5a13e |
# Node ID 3a9b23c6cd62cea84bae6fa095dcdb9490c4bc1c
|
|
|
ca5a13e |
# Parent 38298b55baad22a2472bc5e72530706bd388fd4f
|
|
|
ca5a13e |
Don't skip pxe if virtio nic specified (works for F10 at least). (Alan Pevec)
|
|
|
ca5a13e |
|
|
|
ca5a13e |
diff -r 38298b55baad -r 3a9b23c6cd62 AUTHORS
|
|
|
ca5a13e |
--- a/AUTHORS Mon Nov 10 14:50:13 2008 -0500
|
|
|
ca5a13e |
+++ b/AUTHORS Mon Nov 10 14:53:58 2008 -0500
|
|
|
ca5a13e |
@@ -32,6 +32,7 @@
|
|
|
ca5a13e |
Guido Guenther <agx-at-sigxcpu-dot-org>
|
|
|
ca5a13e |
Francois Kooman <fkooman-at-tuxed-dot-net>
|
|
|
ca5a13e |
Tom Hughes <thh-at-cyberspace-dot-com>
|
|
|
ca5a13e |
+ Alan Pevec <apevec-at-redhat-dot-com>
|
|
|
ca5a13e |
|
|
|
ca5a13e |
...send patches and get your name here...
|
|
|
ca5a13e |
|
|
|
ca5a13e |
diff -r 38298b55baad -r 3a9b23c6cd62 virtinst/FullVirtGuest.py
|
|
|
ca5a13e |
--- a/virtinst/FullVirtGuest.py Mon Nov 10 14:50:13 2008 -0500
|
|
|
ca5a13e |
+++ b/virtinst/FullVirtGuest.py Mon Nov 10 14:53:58 2008 -0500
|
|
|
ca5a13e |
@@ -406,16 +406,10 @@
|
|
|
ca5a13e |
|
|
|
ca5a13e |
disk_bus = self._lookup_device_param("disk", "bus")
|
|
|
ca5a13e |
net_model = self._lookup_device_param("net", "model")
|
|
|
ca5a13e |
- pxe_skipped = False
|
|
|
ca5a13e |
|
|
|
ca5a13e |
# Only overwrite params if they weren't already specified
|
|
|
ca5a13e |
for net in self._install_nics:
|
|
|
ca5a13e |
if net_model and not net.model:
|
|
|
ca5a13e |
- if net_model == "virtio":
|
|
|
ca5a13e |
- # virtio net doesn't seem to support pxe, skip first interface
|
|
|
ca5a13e |
- if not pxe_skipped and isinstance(self.installer, PXEInstaller):
|
|
|
ca5a13e |
- pxe_skipped = True
|
|
|
ca5a13e |
- continue
|
|
|
ca5a13e |
net.model = net_model
|
|
|
ca5a13e |
for disk in self._install_disks:
|
|
|
ca5a13e |
if disk_bus and not disk.bus:
|