summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Prince <dan.prince@rackspace.com>2011-05-26 09:16:02 -0400
committerDan Prince <dan.prince@rackspace.com>2011-05-26 09:16:02 -0400
commitac3348ae282b218a941b33a2d17b7d5ddaeebab6 (patch)
tree9914cd285d7f9b4cf20fa68672e3d3e88065e139
parenta021b43b7d45f8cc803721002a0b2e7d9ea9a06d (diff)
downloadnova-ac3348ae282b218a941b33a2d17b7d5ddaeebab6.tar.gz
nova-ac3348ae282b218a941b33a2d17b7d5ddaeebab6.tar.xz
nova-ac3348ae282b218a941b33a2d17b7d5ddaeebab6.zip
Switching back to chown. I'm fine w/ setfacl too but nova already has 'chown'
via sudoers so this seems reasonable for now.
-rw-r--r--nova/virt/xenapi/vm_utils.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index 931f8e2d4..fdf51ff74 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -1013,8 +1013,7 @@ def _stream_disk(dev, image_type, virtual_size, image_file):
offset = MBR_SIZE_BYTES
_write_partition(virtual_size, dev)
- utils.execute('sudo', 'setfacl', '-m', 'u:%s:rw' % os.getuid(),
- '/dev/%s' % dev)
+ utils.execute('sudo', 'chown', os.getuid(), '/dev/%s' % dev)
with open('/dev/%s' % dev, 'wb') as f:
f.seek(offset)