summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChuck Short <zulcss@ubuntu.com>2011-03-24 09:12:24 -0400
committerChuck Short <zulcss@ubuntu.com>2011-03-24 09:12:24 -0400
commitda159d18b56af44f93cbf2c5e80b6aa3c98d5187 (patch)
tree295fe127aaf1784c63fb8d717d26a9263c980b7b
parent1378db7ac86b69b8a966448b63415b2136b6b5bc (diff)
downloadnova-da159d18b56af44f93cbf2c5e80b6aa3c98d5187.tar.gz
nova-da159d18b56af44f93cbf2c5e80b6aa3c98d5187.tar.xz
nova-da159d18b56af44f93cbf2c5e80b6aa3c98d5187.zip
Dont use popen in dettaching the lxc loop
-rw-r--r--nova/virt/disk.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/virt/disk.py b/nova/virt/disk.py
index f6e6795d6..0bdb04cde 100644
--- a/nova/virt/disk.py
+++ b/nova/virt/disk.py
@@ -140,7 +140,8 @@ def destroy_container(target, instance):
container_dir = '%s/rootfs' % target
utils.execute('sudo', 'umount', container_dir)
finally:
- for loop in utils.popen('sudo losetup -a').readlines():
+ out, err = utils('sudo', 'losetup', '-a')
+ for loop in out.splitlines():
if instance['name'] in loop:
device = loop.split(loop, ':')
utils.execute('sudo', 'losetup', '--detach', device)