← Back to branch summary

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

« back to all changes in this revision

Viewing changes to .pc/9003-fix-path-to-hvmloader-in-testsuite.patch/tests/testdriver.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:
.pc/9003-fix-path-to-hvmloader-in-testsuite.patch/tests/testdriver.xml
54
54
      <target dev='hda' bus='ide'/>
55
55
    </disk>
56
56
    <interface type='user'>
57
 
      <mac address='11:11:11:11:11:11'/>
 
57
      <mac address='22:11:11:11:11:11'/>
58
58
    </interface>
59
59
    <parallel type='file'>
60
60
      <source path='/tmp/foo.log'/>
94
94
      <target dev='sdc' bus='scsi'/>
95
95
      <readonly/>
96
96
    </disk>
 
97
    <disk type='file' device='disk'>
 
98
      <source file='/default-pool/default-vol'/>
 
99
      <target dev='sdd' bus='scsi'/>
 
100
      <driver name="qemu" type="qcow2"/>
 
101
    </disk>
97
102
    <disk type='block' device='disk'>
98
103
      <source dev='/default-pool/sharevol.img'/>
99
104
      <target dev='sdx' bus='scsi'/>
101
106
    </disk>
102
107
    <interface type='network'>
103
108
      <source network='default'/>
104
 
      <mac address='11:22:33:12:34:AB'/>
 
109
      <mac address='22:22:33:12:34:AB'/>
105
110
      <model type='e1000'/>
106
111
    </interface>
107
112
    <interface type='user'>
108
 
      <mac address='11:11:11:11:11:11'/>
 
113
      <mac address='22:11:11:11:11:11'/>
109
114
    </interface>
110
115
    <parallel type='file'>
111
116
      <source path='/tmp/foo.log'/>
219
224
    </target>
220
225
  </volume>
221
226
  <volume>
 
227
    <name>UPPER</name>
 
228
    <capacity>1000000</capacity>
 
229
    <allocation>50000</allocation>
 
230
    <target>
 
231
      <permissions>
 
232
        <mode>0700</mode>
 
233
        <owner>10736</owner>
 
234
        <group>10736</group>
 
235
      </permissions>
 
236
    </target>
 
237
  </volume>
 
238
  <volume>
222
239
    <name>test-clone-simple.img</name>
223
240
    <capacity>1000000</capacity>
224
241
    <allocation>50000</allocation>