← Back to branch summary

~0x44/nova/bug838466

« back to all changes in this revision

Viewing changes to nova/compute/disk.py

  • Committer: Vishvananda Ishaya
  • Date: 2011-01-05 19:16:17 UTC
  • mto: This revision was merged to the branch mainline in revision 562.
  • Revision ID: vishvananda@gmail.com-20110105191617-6a00co7tl2udkyya
fix injection and xml

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/compute/disk.py
110
110
    file_size = os.path.getsize(image)
111
111
    if file_size >= size:
112
112
        return
113
 
    return utils.execute('truncate -s size %s' % (image,))
 
113
    return utils.execute('truncate -s %s %s' % (size, image))
114
114
 
115
115
 
116
116
def inject_data(image, key=None, net=None, partition=None):
175
175
def _link_device(image):
176
176
    if FLAGS.use_cow_images:
177
177
        device = _allocate_device()
178
 
        utils.execute('sudo qemu-nbd --connect=%s %s' % (device, image))
 
178
        utils.execute('sudo qemu-nbd -c %s %s' % (device, image))
 
179
        return device
179
180
    else:
180
181
        out, err = utils.execute('sudo losetup --find --show %s' % image)
181
182
        if err:
184
185
        return out.strip()
185
186
 
186
187
 
187
 
def _unlink_device(image, device):
 
188
def _unlink_device(device):
188
189
    if FLAGS.use_cow_images:
189
 
        utils.execute('sudo qemu-nbd --disconnect %s' % image)
 
190
        utils.execute('sudo qemu-nbd -d %s' % device)
190
191
        _free_device(device)
191
192
    else:
192
193
        utils.execute('sudo losetup --detach %s' % device)