Changeset 2055 for trunk/packages/invirt-xen-config

Timestamp:

Jan 31, 2009, 4:47:50 AM (16 years ago)

Author:

price

Message:

eth2 -> config.xen.network.iface

Location:

trunk/packages/invirt-xen-config

Files:

• debian/changelog (modified) (1 diff)
• invirt-database (modified) (1 diff)
• vif-invirtroute (modified) (1 diff)

trunk/packages/invirt-xen-config/debian/changelog

@@ -2 +2 @@
 
   * 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

trunk/packages/invirt-xen-config/invirt-database

@@ -85 +85 @@
 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)
 

trunk/packages/invirt-xen-config/vif-invirtroute

@@ -66 +66 @@
         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