summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Jones <rjones@redhat.com>2010-05-04 16:06:58 +0100
committerRichard Jones <rjones@redhat.com>2010-05-04 17:01:34 +0100
commitfbf29976b33a69c64dc7847c54454bf2cfa5fde6 (patch)
tree0e09a387f08fcccee1ec04c023333c10d7305651
parent8a9f2ca65521d093ac14307aca4370d9497ac840 (diff)
downloadlibguestfs-fbf29976b33a69c64dc7847c54454bf2cfa5fde6.tar.gz
libguestfs-fbf29976b33a69c64dc7847c54454bf2cfa5fde6.tar.xz
libguestfs-fbf29976b33a69c64dc7847c54454bf2cfa5fde6.zip
Use link-local addresses between appliance and host (RHBZ#588763).
-rwxr-xr-xappliance/init4
-rw-r--r--src/guestfs.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/appliance/init b/appliance/init
index 15dab614..98538de2 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 d68f12b9..e0f60f4d 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. */