summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorPádraig Brady <pbrady@redhat.com>2012-09-08 02:43:01 +0100
committerPádraig Brady <pbrady@redhat.com>2012-09-08 02:47:41 +0100
commitb35b34a65a6ddcfee524304cc548b4dfe1fc6cd5 (patch)
tree5ec9498c26db62e816b236bb96a6a43e6e1709ca /nova
parentbfce34fdd95e334e58f1014e1b9c276046aa831f (diff)
downloadnova-b35b34a65a6ddcfee524304cc548b4dfe1fc6cd5.tar.gz
nova-b35b34a65a6ddcfee524304cc548b4dfe1fc6cd5.tar.xz
nova-b35b34a65a6ddcfee524304cc548b4dfe1fc6cd5.zip
fix unmounting of LXC containers in the presence of symlinks
When looking up the mount dir in /proc/mounts we need to canonicalize the path so that symlinks are resolved Fixes bug: 1046313 Change-Id: Ib2bb8253e9cdfeda3c6ba13e56a0f907518ff558
Diffstat (limited to 'nova')
-rw-r--r--nova/virt/disk/api.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/virt/disk/api.py b/nova/virt/disk/api.py
index f1c1c409c..008445a4a 100644
--- a/nova/virt/disk/api.py
+++ b/nova/virt/disk/api.py
@@ -209,7 +209,7 @@ class _DiskImage(object):
with open("/proc/mounts", 'r') as ifp:
for line in ifp:
fields = line.split()
- if fields[1] == path:
+ if fields[1] == os.path.realpath(path):
device = fields[0]
break
return device