eth2 -> config.xen.network.iface

svn path=/trunk/packages/invirt-xen-config/; revision=2055

diff --git a/debian/changelog b/debian/changelog
index 1459f86..c691403 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 invirt-xen-config (0.0.21) unstable; urgency=low
 
   * Move sysvms/* into xvm-prodconfig from invirt-xen-config
+  * eth2 -> config.xen.network.iface
 
- -- Greg Price <price@mit.edu>  Fri, 30 Jan 2009 21:15:25 -0500
+ -- Greg Price <price@mit.edu>  Sat, 31 Jan 2009 04:43:54 -0500
 
 invirt-xen-config (0.0.20) unstable; urgency=low
 

diff --git a/invirt-database b/invirt-database
index 76e959e..5ee57f9 100644 (file)
--- a/invirt-database
+++ b/invirt-database
@@ -84,7 +84,8 @@ elif codepath == 'paravm':
 
 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)
 
 for d in machine.disks:

diff --git a/vif-invirtroute b/vif-invirtroute
index 63b2679..2b3a88d 100755 (executable)
--- a/vif-invirtroute
+++ b/vif-invirtroute
@@ -65,7 +65,7 @@ if [  ${vif_type} != "ioemu"  -o  x${qemu_online} = xyes ] ; then
     # the guest using those addresses.
        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
        done