← Back to branch summary

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

« back to all changes in this revision

Viewing changes to tests/interface-xml/test-bridge.xml

  • Committer: Bazaar Package Importer
  • Author(s): Jean-Louis Dupond
  • Date: 2010-05-05 03:32:42 UTC
  • mfrom: (1.3.13 sid)
  • Revision ID: james.westby@ubuntu.com-20100505033242-um6f6pjcc89i07m0
Tags: 0.500.3-1ubuntu1
https://launchpad.net/bugs/590068
https://launchpad.net/bugs/524318
https://launchpad.net/bugs/533048
https://launchpad.net/bugs/215084
* Merge from debian unstable. (LP: #590068)  Remaining changes:
  - debian/patches/9001_Ubuntu.patch:
     + Added lucid and maverick to OS list and enable virtio for it.
  - debian/patches/0003-Fix-patch-to-keyboard-configuration.patch: disable
    as the keyboard config in Ubuntu is still in /etc/default/console-setup
    and this was causing virt-manager to always default to a en-us
    keyboard. (LP: #524318)
  - debian/control: added acl package to depends. (LP: #533048)
  - Demote virt-viewer to Suggests, as it's in universe.
  - Recommends libvirt-bin (LP: #215084)
* debian/patches/9002-add-ca-keymap.patch: dropped, its now in upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/interface-xml/test-bridge.xml
 
1
<interface type='bridge' name='test-bridge'>
 
2
  <bridge stp='off' delay='7'>
 
3
    <interface type='ethernet' name='vlaneth1'>
 
4
    </interface>
 
5
    <interface type='bond' name='bond-brbond'>
 
6
      <start mode='none'/>
 
7
      <bond mode='active-backup'>
 
8
        <miimon freq='100' updelay='10' carrier='ioctl'/>
 
9
        <interface type='ethernet' name='brbond-eth0'>
 
10
        </interface>
 
11
        <interface type='ethernet' name='brbond-eth1'>
 
12
        </interface>
 
13
      </bond>
 
14
    </interface>
 
15
    <interface type='ethernet' name='eth0'>
 
16
      <start mode='none'/>
 
17
      <mac address='00:FF:EE:FF:EE:FF'/>
 
18
    </interface>
 
19
  </bridge>
 
20
</interface>