~ubuntu-branches/ubuntu/jaunty/libvirt/jaunty-updates

« back to all changes in this revision

Viewing changes to debian/patches/dynamic_bridge_names.patch

  • Committer: Bazaar Package Importer
  • Author(s): Soren Hansen
  • Date: 2009-01-08 23:01:16 UTC
  • mfrom: (1.1.8 upstream) (3.1.7 sid)
  • Revision ID: james.westby@ubuntu.com-20090108230116-niu4xzgypapywhmx
Tags: 0.5.1-4ubuntu1
* Merge with Debian experimental.
  - debian/control:
    + Don't build-depend on QEmu.
    + Add "XS-Debian-" prefix to Debian's Vcs headers.
    + Bump bridge-utils, dnsmasq-base, netcat-openbsd, and iptables
      to Depends of libvirt-bin.
    + s/interract/interact/g
    + Add versioned Conflicts/Replaces to libvirt0 for libvirt0-dbg,
      since we used to ship them as such.
  - Rename libvirt group to libvirtd.
  - 0005-delayed_iff_up_bridge.patch: Don't try to bring up the bridge
    before at least one interface has been added to it.
  - dont_clobber_existing_bridges.patch: Assign the name of the virtual
    bridge dynamically to avoid interfering with existing bridges.
  - better_default_uri_virsh.patch: Default to qemu:///system if the
    user has write access to the libvirt socket, otherwise
    qemu:///session.
  - We call libxen-dev libxen3-dev, so change all references.
* Included (but did not enable) opennebula patch (since it's not in
  the archive yet).

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
Index: libvirt-0.4.6-5ubuntu1/src/bridge.c
 
1
Index: libvirt-0.5.1/src/bridge.c
2
2
===================================================================
3
 
--- libvirt-0.4.6-5ubuntu1.orig/src/bridge.c    2008-11-18 14:51:45.184583106 +0100
4
 
+++ libvirt-0.4.6-5ubuntu1/src/bridge.c 2008-11-18 14:56:24.377255498 +0100
 
3
--- libvirt-0.5.1.orig/src/bridge.c     2009-01-08 23:04:59.728468586 +0100
 
4
+++ libvirt-0.5.1/src/bridge.c  2009-01-08 23:04:59.808437269 +0100
5
5
@@ -120,7 +120,13 @@
6
6
  * @name: the bridge name
7
7
  *