[Libguestfs] [PATCH 2/2] Use link-local addresses between appliance and host (RHBZ#588763).

[Matthew Booth]

On 04/05/10 16:16, Richard W.M. Jones wrote:
>>From e196ba2788886987f4b6d3ad4d86e31d1259e2a8 Mon Sep 17 00:00:00 2001
> From: Richard Jones <rjones at redhat.com>
> Date: Tue, 4 May 2010 16:06:58 +0100
> Subject: [PATCH 2/2] Use link-local addresses between appliance and host (RHBZ#588763).
> 
> ---
>  appliance/init |    4 ++--
>  src/guestfs.c  |    6 +++---
>  2 files changed, 5 insertions(+), 5 deletions(-)
> 
> 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..958bf19 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.2.0/16"

I think you meant 169.254.2.0/24. Either that, or 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. */
> -- 1.6.6.1

Apart from that it looks fine.

Matt
-- 
Matthew Booth, RHCA, RHCSS
Red Hat Engineering, Virtualisation Team

M:       +44 (0)7977 267231
GPG ID:  D33C3490
GPG FPR: 3733 612D 2D05 5458 8A8A 1600 3441 EA19 D33C 3490