← Back to branch summary

~ubuntu-branches/ubuntu/quantal/virtinst/quantal-proposed

« back to all changes in this revision

Viewing changes to tests/xmlconfig-xml/boot-default-bridge.xml

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-07-24 08:52:01 UTC
  • mfrom: (1.6.8 sid)
  • Revision ID: package-import@ubuntu.com-20120724085201-q3h0cbabg4t46gfm
Tags: 0.600.2-1ubuntu1
* Merge from debian unstable. Remaining changes:
  - debian/patches/9003-fix-path-to-hvmloader-in-testsuite.patch: adjust
    testsuite for 0001-fix-path-to-hvmloader.patch and
    0002-Fix-path-to-pygrub.patch.
  - debian/patches/9004_ubuntu_fix_tree_support.patch: Fix tree detection
    for all ISO/HTTP source, to not longer fail with cobbler/koan.
  - debian/patches/0004-Fix-path-to-qemu-dm.patch: fix the path to the
    qemu-dm binary.
  - debian/{control,rules,pyversions}: Build using dh_python2, use
    debhelper v8 instead of cdbs; for some reason the package build an
    empty binary package when using dh_python2.
  - debian/control: added acl package to depends.
  - debian/control: added libvirt-bin to recommends
* Dropped patches:
  - debian/patches/9005_ubuntu_releases.patch: Upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/xmlconfig-xml/boot-default-bridge.xml
20
20
    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
21
21
    <interface type='bridge'>
22
22
      <source bridge='br0'/>
23
 
      <mac address='11:22:33:44:55:66'/>
 
23
      <mac address='22:22:33:44:55:66'/>
24
24
    </interface>
25
25
<interface type="bridge">
26
 
      <mac address="11:22:33:44:55:67"/>
 
26
      <mac address="22:22:33:44:55:67"/>
27
27
      <source bridge="foobr0"/>
28
28
    </interface>
29
29
 
30
30
<interface type="bridge">
31
 
      <mac address="11:22:33:44:55:68"/>
 
31
      <mac address="22:22:33:44:55:68"/>
32
32
    </interface>
33
33
 
34
34
    <input type='mouse' bus='ps2'/>