← 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-many-nics.xml

  • Committer: Bazaar Package Importer
  • Author(s): Marc Deslauriers
  • Date: 2011-02-01 15:40:11 UTC
  • mfrom: (1.3.16 experimental)
  • Revision ID: james.westby@ubuntu.com-20110201154011-op0nusgc240xajvb
Tags: 0.500.5-1ubuntu1
* Merge from debian experimental. Remaining changes:
  - debian/patches/9001_Ubuntu.patch:
     + Updated to add maverick and natty to OS list and enable virtio
       for them.
  - 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. (refreshed)
  - debian/control: added acl package to depends.
  - Demote virt-viewer to Suggests, as it's in universe.
  - Recommends libvirt-bin
* Removed patches:
  - debian/patches/9002-libvirt_disk_format.patch: Upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/xmlconfig-xml/boot-many-nics.xml
33
33
    <interface type='bridge'>
34
34
      <source bridge='foobr0'/>
35
35
      <mac address='22:22:22:22:22:22'/>
 
36
      <target dev='foo1'/>
 
37
    </interface>
 
38
    <interface type='ethernet'>
 
39
      <source dev='testeth1'/>
 
40
      <mac address='00:11:00:22:00:33'/>
36
41
    </interface>
37
42
    <input type='mouse' bus='ps2'/>
38
43
    <graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>