Index: trunk/packages/invirt-xen-config/debian/changelog
===================================================================
--- trunk/packages/invirt-xen-config/debian/changelog	(revision 2970)
+++ trunk/packages/invirt-xen-config/debian/changelog	(revision 2972)
@@ -1,2 +1,8 @@
+invirt-xen-config (0.0.29) unstable; urgency=low
+
+  * Merged in r2821,2824,2827 from hvirt branch.
+
+ -- Greg Brockman <gdb@mit.edu>  Sun, 31 Jan 2010 18:44:53 -0500
+
 invirt-xen-config (0.0.28) unstable; urgency=low
 
Index: trunk/packages/invirt-xen-config/debian/transform_xend-config.sxp.invirt.mako
===================================================================
--- trunk/packages/invirt-xen-config/debian/transform_xend-config.sxp.invirt.mako	(revision 2970)
+++ trunk/packages/invirt-xen-config/debian/transform_xend-config.sxp.invirt.mako	(revision 2972)
@@ -4,9 +4,19 @@
 from invirt.config import structs as cfg
 import os
-hostname = os.uname()[1].split('.')[0]
+fqdn = os.uname()[1]
+internal_ip = None
+# This hack is necessary because cfg.hosts is an array rather than a dict.
+for host in cfg.hosts:
+  if host.hostname == fqdn:
+    internal_ip = host.internal_ip
+    break
+
+class xend_template_exception(Exception): pass
+if internal_ip is None:
+  raise xend_template_exception('Could not find an internal IP in the configuration for host %s' % fqdn)
 %>
 EOF
 
-s/^\#?\(xend-relocation-address ''\)/(xend-relocation-address '\${hostname}-internal')/m or die;
+s/^\#?\(xend-relocation-address ''\)/(xend-relocation-address '\${internal_ip}')/m or die;
 s/^\(xend-relocation-hosts-allow '[^']*'\)/(xend-relocation-hosts-allow '')/m or die;
 s/^\(dom0-min-mem [0-9]*\)/(dom0-min-mem 1536)/m or die;