Index: /trunk/packages/invirt-xen-config/debian/changelog
===================================================================
--- /trunk/packages/invirt-xen-config/debian/changelog	(revision 2054)
+++ /trunk/packages/invirt-xen-config/debian/changelog	(revision 2055)
@@ -2,6 +2,7 @@
 
   * Move sysvms/* into xvm-prodconfig from invirt-xen-config
-
- -- Greg Price <price@mit.edu>  Fri, 30 Jan 2009 21:15:25 -0500
+  * eth2 -> config.xen.network.iface
+
+ -- Greg Price <price@mit.edu>  Sat, 31 Jan 2009 04:43:54 -0500
 
 invirt-xen-config (0.0.20) unstable; urgency=low
Index: /trunk/packages/invirt-xen-config/invirt-database
===================================================================
--- /trunk/packages/invirt-xen-config/invirt-database	(revision 2054)
+++ /trunk/packages/invirt-xen-config/invirt-database	(revision 2055)
@@ -85,5 +85,6 @@
 for n in machine.nics:
     check(re.match('^[0-9a-fA-F:]+$', n.mac_addr) and re.match('^[0-9.]*$', n.ip))
-    d = '%smac=%s, ip=%s, script=vif-invirtroute netdev=eth2' % (viftype, n.mac_addr, n.ip)
+    d = ('%smac=%s, ip=%s, script=vif-invirtroute netdev=%s'
+         % (viftype, n.mac_addr, n.ip, config.xen.network.iface))
     vif.append(d)
 
Index: /trunk/packages/invirt-xen-config/vif-invirtroute
===================================================================
--- /trunk/packages/invirt-xen-config/vif-invirtroute	(revision 2054)
+++ /trunk/packages/invirt-xen-config/vif-invirtroute	(revision 2055)
@@ -66,5 +66,5 @@
 	for addr in ${ip} ; do
 	    ${cmdprefix} ip route ${ipcmd} ${addr} dev ${dev} src ${main_ip}
-	    arpspoof -i eth2 -t 18.181.0.1 ${addr}&
+	    arpspoof -i $(invirt-getconf xen.network.iface) -t 18.181.0.1 ${addr}&
 	    sleep 5
 	    kill %arpspoof
Index: /trunk/packages/xvm-devconfig/debian/changelog
===================================================================
--- /trunk/packages/xvm-devconfig/debian/changelog	(revision 2054)
+++ /trunk/packages/xvm-devconfig/debian/changelog	(revision 2055)
@@ -2,6 +2,7 @@
 
   * Include a trac stanza to make invirt-web happy.
+  * xen.network.iface = eth0
 
- -- Greg Price <price@mit.edu>  Sat, 31 Jan 2009 03:16:30 -0500
+ -- Greg Price <price@mit.edu>  Sat, 31 Jan 2009 04:46:18 -0500
 
 xvm-devconfig (0.20) unstable; urgency=low
Index: /trunk/packages/xvm-devconfig/master.yaml
===================================================================
--- /trunk/packages/xvm-devconfig/master.yaml	(revision 2054)
+++ /trunk/packages/xvm-devconfig/master.yaml	(revision 2055)
@@ -38,7 +38,9 @@
  parent: mit.edu
 
-network:
- gateway: 18.181.0.1
- netmask: 255.255.0.0
+xen:
+ network:
+  gateway: 18.181.0.1
+  netmask: 255.255.0.0
+  iface: eth0
 
 web:
Index: /trunk/packages/xvm-prodconfig/debian/changelog
===================================================================
--- /trunk/packages/xvm-prodconfig/debian/changelog	(revision 2054)
+++ /trunk/packages/xvm-prodconfig/debian/changelog	(revision 2055)
@@ -2,6 +2,7 @@
 
   * Move sysvms/* into xvm-prodconfig from invirt-xen-config
-
- -- Greg Price <price@mit.edu>  Fri, 30 Jan 2009 21:14:43 -0500
+  * xen.network.iface = eth2
+
+ -- Greg Price <price@mit.edu>  Sat, 31 Jan 2009 04:45:41 -0500
 
 xvm-prodconfig (1.1.7) unstable; urgency=low
Index: /trunk/packages/xvm-prodconfig/master.yaml
===================================================================
--- /trunk/packages/xvm-prodconfig/master.yaml	(revision 2054)
+++ /trunk/packages/xvm-prodconfig/master.yaml	(revision 2055)
@@ -83,2 +83,6 @@
   - quentin
   - hartmans
+
+xen:
+ network:
+  iface: eth2