10:15 a.m.
Couple of notes:
(1) You may need to 'make clean' after applying this patch. There is
some missing dep so it seems the appliance isn't fully rebuilt.
(2) [Comment mainly directed to Matt] This is not a candidate to be
automatically added to the stable 1.2 branch. It's far too large of a
change for a stable release. Since this change may be required for
V2V, please clone #588763 for any branches where you need the fix.
Rich.
--
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming blog: http://rwmj.wordpress.com
Fedora now supports 80 OCaml packages (the OPEN alternative to F#)
http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora
10:16 a.m.
New subject: [PATCH 1/2] Change network configuration to use macros.
--
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
libguestfs lets you edit virtual machines. Supports shell scripting,
bindings from many languages. http://et.redhat.com/~rjones/libguestfs/
See what it can do: http://et.redhat.com/~rjones/libguestfs/recipes.html
10:16 a.m.
New subject: [PATCH 2/2] Use link-local addresses between appliance and host (RHBZ#588763).
--
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
virt-df lists disk usage of guests without needing to install any
software inside the virtual machine. Supports Linux and Windows.
http://et.redhat.com/~rjones/virt-df/
10:41 a.m.
New subject: [PATCH 1/2] Change network configuration to use macros.
On 04/05/10 16:16, Richard W.M. Jones wrote:
>From 8a9f2ca65521d093ac14307aca4370d9497ac840 Mon Sep 17 00:00:00
2001
From: Richard Jones <rjones(a)redhat.com>
Date: Tue, 4 May 2010 15:06:09 +0100
Subject: [PATCH 1/2] Change network configuration to use macros.
Change the network configuration so everything is set using
some macros at the top of src/guestfs.c.
Also, rename the macros used in the daemon so they are not the
same. It was a very long time since these sets of macros had to
match the ones defined in src/guestfs.c, despite what the comment
said.
Note that this commit should not change the semantics of the
program at all.
ACK.
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
10:46 a.m.
New subject: [PATCH 2/2] Use link-local addresses between appliance and host (RHBZ#588763).
On 04/05/10 16:16, Richard W.M. Jones wrote:
>From e196ba2788886987f4b6d3ad4d86e31d1259e2a8 Mon Sep 17 00:00:00
2001
From: Richard Jones <rjones(a)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
11:02 a.m.
New subject: [PATCH 2/2] Use link-local addresses between appliance and host (RHBZ#588763).
On Tue, May 04, 2010 at 04:46:57PM +0100, Matthew Booth wrote:
On 04/05/10 16:16, Richard W.M. Jones wrote:
> +#define NETWORK "169.254.2.0/16"
I think you meant 169.254.2.0/24. Either that, or 169.254.0.0/16.
Yeah, I meant:
+#define NETWORK "169.254.0.0/16"
I've just retested with this fix and it (still) works.
Rich.
--
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
libguestfs lets you edit virtual machines. Supports shell scripting,
bindings from many languages. http://et.redhat.com/~rjones/libguestfs/
See what it can do: http://et.redhat.com/~rjones/libguestfs/recipes.html
5368
days inactive
5368
days old
5 comments
2 participants
participants (2)
-
Matthew Booth -
Richard W.M. Jones