summaryrefslogtreecommitdiffstats
path: root/nova/rootwrap
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2011-12-22 19:32:25 +0000
committerGerrit Code Review <review@openstack.org>2011-12-22 19:32:25 +0000
commit640e632988c33511a2ac7043500ace60aac2eaea (patch)
tree9afd456e28fd22d0f6498682f491435f257bf26d /nova/rootwrap
parent36c46167115f50cc10b0c37d17e18e786efb1bc8 (diff)
parentdd56fd39d558c4052c307e617325a8631016ec70 (diff)
Merge "Bug#898257 support handling images with libguestfs"
Diffstat (limited to 'nova/rootwrap')
-rwxr-xr-xnova/rootwrap/compute.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/nova/rootwrap/compute.py b/nova/rootwrap/compute.py
index cd971e0d1..cee4cca2c 100755
--- a/nova/rootwrap/compute.py
+++ b/nova/rootwrap/compute.py
@@ -44,6 +44,14 @@ filters = [
# nova/virt/disk/loop.py: 'losetup', '--detach', device
CommandFilter("/sbin/losetup", "root"),
+ # nova/virt/disk/guestfs.py: 'guestmount', '--rw', '-a', image, '-i'
+ # nova/virt/disk/guestfs.py: 'guestmount', '--rw', '-a', image, '-m' dev
+ Commandfilter("/usr/bin/guestmount", "root"),
+
+ # nova/virt/disk/guestfs.py: 'fusermount', 'u', mount_dir
+ Commandfilter("/bin/fusermount", "root"),
+ Commandfilter("/usr/bin/fusermount", "root"),
+
# nova/virt/disk/api.py: 'tee', metadata_path
# nova/virt/disk/api.py: 'tee', '-a', keyfile
# nova/virt/disk/api.py: 'tee', netfile