From: Richard Jones <rjones@redhat.com>
Date: Tue, 4 May 2010 15:06:58 +0000 (+0100)
Subject: Use link-local addresses between appliance and host (RHBZ#588763).
X-Git-Tag: 1.3.10~12
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=fbf29976b33a69c64dc7847c54454bf2cfa5fde6;p=libguestfs.git

Use link-local addresses between appliance and host (RHBZ#588763).
---

diff --git a/appliance/init b/appliance/init
index 15dab61..98538de 100755
--- a/appliance/init
+++ b/appliance/init
@@ -52,8 +52,8 @@ hwclock -u -s
 
 # Set up the network.
 ifconfig lo 127.0.0.1
-ifconfig eth0 10.0.2.10
-route add default gw 10.0.2.2
+ifconfig eth0 169.254.2.10
+route add default gw 169.254.2.2
 
 # Scan for LVM.
 modprobe dm_mod ||:
diff --git a/src/guestfs.c b/src/guestfs.c
index d68f12b..e0f60f4 100644
--- a/src/guestfs.c
+++ b/src/guestfs.c
@@ -128,9 +128,9 @@ static int qemu_supports (guestfs_h *g, const char *option);
  * typical Linux configurations of libguestfs, guestfwd is not
  * actually used any more.
  */
-#define NETWORK "10.0.2.0/8"
-#define ROUTER "10.0.2.2"
-#define GUESTFWD_ADDR "10.0.2.4"
+#define NETWORK "169.254.0.0/16"
+#define ROUTER "169.254.2.2"
+#define GUESTFWD_ADDR "169.254.2.4"
 #define GUESTFWD_PORT "6666"
 
 /* GuestFS handle and connection. */