Add ne2k-pci driver to the appliance.

This allows people to use the ne2k-pci network driver, for those
situations where the virtio_net driver is broken (cough 516022 cough).

diff --git a/appliance/kmod.whitelist.in b/appliance/kmod.whitelist.in
index 6fb5eff..3901a57 100644 (file)
--- a/appliance/kmod.whitelist.in
+++ b/appliance/kmod.whitelist.in
@@ -7,6 +7,10 @@
 
 virtio*.ko
 
+# We normally use virtio_net, but keep these in reserve.
+8390.ko
+ne2k-pci.ko
+
 # drivers for QEMUs IDE/SCSI device emulation
 cdrom.ko
 i2c-piix4.ko

diff --git a/src/guestfs.c b/src/guestfs.c
index edff8eb..de63275 100644 (file)
--- a/src/guestfs.c
+++ b/src/guestfs.c
@@ -1103,7 +1103,7 @@ guestfs_launch (guestfs_h *g)
     }
 #endif
     add_cmdline (g, "-net");
-    add_cmdline (g, "nic,model=virtio,vlan=0");
+    add_cmdline (g, "nic,model=virtio,vlan=0"); /* model=ne2k_pci also works */
 
     /* These options recommended by KVM developers to improve reliability. */
     if (qemu_supports (g, "-no-hpet"))