[Pkg-xen-changes] r1071 - in trunk/xen: . debian debian/scripts

[Ian Campbell]

Author: ijc-guest
Date: Fri Jul 13 16:46:30 2012
New Revision: 1071

Log:
Merge /branches/wheezy/xen.

Modified:
   trunk/xen/   (props changed)
   trunk/xen/debian/changelog
   trunk/xen/debian/scripts/qemu-ifup

Modified: trunk/xen/debian/changelog
==============================================================================
--- trunk/xen/debian/changelog	Fri Jul 13 10:30:32 2012	(r1070)
+++ trunk/xen/debian/changelog	Fri Jul 13 16:46:30 2012	(r1071)
@@ -8,6 +8,13 @@
 
  -- Bastian Blank <waldi at debian.org>  Sun, 13 May 2012 12:21:10 +0000
 
+xen (4.1.3~rc1+hg-20120614.a9c0a89c08f2-5) UNRELEASED; urgency=low
+
+  [ Ian Campbell ]
+  * Set tap device MAC addresses to fe:ff:ff:ff:ff:ff (Closes: #671018)
+
+ -- Bastian Blank <waldi at debian.org>  Mon, 09 Jul 2012 19:13:45 +0100
+
 xen (4.1.3~rc1+hg-20120614.a9c0a89c08f2-4) unstable; urgency=low
 
   * Add Build-Using info to xen-utils package.

Modified: trunk/xen/debian/scripts/qemu-ifup
==============================================================================
--- trunk/xen/debian/scripts/qemu-ifup	Fri Jul 13 10:30:32 2012	(r1070)
+++ trunk/xen/debian/scripts/qemu-ifup	Fri Jul 13 16:46:30 2012	(r1071)
@@ -3,5 +3,11 @@
 echo -c 'config qemu network with xen bridge for '
 echo $*
 
+# Initialise a dummy MAC address. We choose the numerically
+# largest non-broadcast address to prevent the address getting
+# stolen by an Ethernet bridge for STP purposes.
+# (FE:FF:FF:FF:FF:FF)
+ip link set $1 address fe:ff:ff:ff:ff:ff || true
+
 ifconfig $1 0.0.0.0 up
 brctl addif $2 $1