[libguestfs/f13/master] Fix networking in the appliance

[Marek Goldmann]

commit 933044364ab89a59c1884b445572dfb4a3717f32
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date:   Thu Oct 28 16:26:23 2010 +0200

    Fix networking in the appliance

 0023-Fix-networking-in-the-appliance.patch |   31 ++++++++++++++++++++++++++++
 libguestfs.spec                            |    7 +++++-
 2 files changed, 37 insertions(+), 1 deletions(-)
---
diff --git a/0023-Fix-networking-in-the-appliance.patch b/0023-Fix-networking-in-the-appliance.patch
new file mode 100644
index 0000000..7c88b6d
--- /dev/null
+++ b/0023-Fix-networking-in-the-appliance.patch
@@ -0,0 +1,31 @@
+From: Matthew Booth <mbooth at redhat.com>
+Date: Wed, 27 Oct 2010 09:55:24 +0000 (+0100)
+Subject: Fix networking in the appliance.
+X-Git-Tag: 1.5.24~14
+X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=commitdiff_plain;h=61da709722ec244da1c3c7d4f1a8706f76687cb3
+
+Fix networking in the appliance.
+
+Commit 4963be85 re-introduced networking to the appliance,
+but didn't configure the custom network the appliance expects
+since we switched to link local addressing. This patch
+configures QEMU to use the custom network again.
+
+Note that you still need to use guestfs_set_network (g, 1)
+to enable user networking.
+---
+
+diff --git a/src/launch.c b/src/launch.c
+index 7f2f74c..047a1e1 100644
+--- a/src/launch.c
++++ b/src/launch.c
+@@ -491,7 +491,7 @@ guestfs__launch (guestfs_h *g)
+     /* Enable user networking. */
+     if (g->enable_network) {
+       add_cmdline (g, "-netdev");
+-      add_cmdline (g, "user,id=usernet");
++      add_cmdline (g, "user,id=usernet,net=169.254.0.0/16");
+       add_cmdline (g, "-device");
+       add_cmdline (g, NET_IF ",netdev=usernet");
+     }
+
diff --git a/libguestfs.spec b/libguestfs.spec
index 92d29d7..1940f49 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -42,7 +42,7 @@ Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
 Version:       1.4.3
-Release:       4%{?dist}
+Release:       5%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -71,6 +71,7 @@ Patch19:       0019-Call-sync-after-guestfsd-exits.patch
 Patch20:       0020-Shut-down-the-appliance-cleanly.patch
 Patch21:       0021-Ignore-launch-error-in-virt-rescue.-RHBZ-618556.patch
 Patch22:       0022-build-Don-t-add-version-extra-string-to-the-version-.patch
+Patch23:       0023-Fix-networking-in-the-appliance.patch
 
 # Disable FUSE tests, not supported in Koji at the moment.
 Patch9998:     libguestfs-1.0.79-no-fuse-test.patch
@@ -448,6 +449,7 @@ chmod +x regressions/test-luks.sh
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
+%patch23 -p1
 
 %patch9998 -p1
 %patch9999 -p1
@@ -783,6 +785,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 28 2010 Marek Goldmann <mgoldman at redhat.com> - 1:1.4.3-5
+- Fix networking in the appliance.
+
 * Fri Aug 27 2010 Richard Jones <rjones at redhat.com> - 1:1.4.3-4
 - Change the mirror so local builds use Fedora 13 repo.