Ian Campbell
2012-Jul-12 23:28 UTC
[Pkg-xen-changes] r1069 - in trunk/xen/debian: . scripts
Author: ijc-guest
Date: Thu Jul 12 23:28:39 2012
New Revision: 1069
Log:
Merge branch ''wheezy''
Conflicts:
xen/debian/changelog
xen/debian/patches/series
xen/debian/rules
xen/debian/templates/control.source.in
Modified:
trunk/xen/debian/changelog
trunk/xen/debian/scripts/qemu-ifup
trunk/xen/debian/scripts/xen-version
Modified: trunk/xen/debian/changelog
=============================================================================---
trunk/xen/debian/changelog Thu Jul 12 23:28:23 2012 (r1068)
+++ trunk/xen/debian/changelog Thu Jul 12 23:28:39 2012 (r1069)
@@ -1,11 +1,15 @@
xen (4.2~hg-20120617.32034d1914a6-1) UNRELEASED; urgency=low
+ [ Bastian Blank ]
* New upstream snapshot.
* Build-depend against libglib2.0-dev and libyajl-dev.
* Disable seabios build for now.
* Remove support for Lenny and earlier.
* Support build-arch and build-indep make targets.
+ [ Ian Campbell ]
+ * Set tap device MAC addresses to fe:ff:ff:ff:ff:ff (Closes: #671018)
+
-- Bastian Blank <waldi at debian.org> Sun, 13 May 2012 12:21:10 +0000
xen (4.1.3~rc1+hg-20120614.a9c0a89c08f2-4) unstable; urgency=low
Modified: trunk/xen/debian/scripts/qemu-ifup
=============================================================================---
trunk/xen/debian/scripts/qemu-ifup Thu Jul 12 23:28:23 2012 (r1068)
+++ trunk/xen/debian/scripts/qemu-ifup Thu Jul 12 23:28:39 2012 (r1069)
@@ -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
Modified: trunk/xen/debian/scripts/xen-version
=============================================================================---
trunk/xen/debian/scripts/xen-version Thu Jul 12 23:28:23 2012 (r1068)
+++ trunk/xen/debian/scripts/xen-version Thu Jul 12 23:28:39 2012 (r1069)
@@ -9,7 +9,16 @@
type="$(cat /sys/hypervisor/type)"
if [ "$type" = xen ]; then
DIR=/sys/hypervisor/version
- VERSION="$(cat $DIR/major).$(cat $DIR/minor)"
+ VERSION_EXTRA="$(cat $DIR/extra)"
+ if [ "$VERSION_EXTRA" = "-unstable" ]; then
+ # Old xen-unstable
+ VERSION=unstable
+ elif [ "$VERSION_EXTRA" != "${VERSION_EXTRA#-}" ];
then
+ # ABI for Lenny and smaller
+ VERSION="$(cat $DIR/major).$(cat
$DIR/minor)$VERSION_EXTRA"
+ else
+ VERSION="$(cat $DIR/major).$(cat $DIR/minor)"
+ fi
elif [ -z "$type" ]; then
error "Can''t read hypervisor type from sysfs!"
else